Enable WavPack decoding in ffmpeg (once they'll increment the version number). Some...

[vlc] / modules / codec / flac.c

diff --git a/modules/codec/flac.c b/modules/codec/flac.c
index 3201d4c5cbba285069bd1c4d498922c9abab5e4e..0fe8f29dfa51504180228095e48b382a504e95c0 100644 (file)
--- a/modules/codec/flac.c
+++ b/modules/codec/flac.c
@@ -211,7 +211,7 @@ static int OpenDecoder( vlc_object_t *p_this )
     aout_DateSet( &p_sys->end_date, 0 );
     p_sys->i_state = STATE_NOSYNC;
     p_sys->b_stream_info = VLC_FALSE;
-
+    p_sys->p_block=NULL;
     p_sys->bytestream = block_BytestreamInit( p_dec );
 
 #ifdef USE_LIBFLAC
@@ -650,7 +650,7 @@ static void DecoderErrorCallback( const FLAC__StreamDecoder *decoder,
     switch( status )
     {
     case FLAC__STREAM_DECODER_ERROR_STATUS_LOST_SYNC:
-        msg_Err( p_dec, "an error in the stream caused the decoder to "
+        msg_Warn( p_dec, "an error in the stream caused the decoder to "
                  "lose synchronization." );
         break;
     case FLAC__STREAM_DECODER_ERROR_STATUS_BAD_HEADER:
@@ -705,28 +705,28 @@ static void decoder_state_error( decoder_t *p_dec,
     switch ( state )
     {
     case FLAC__STREAM_DECODER_SEARCH_FOR_METADATA:
-        msg_Err( p_dec, "the decoder is ready to search for metadata." );
+        msg_Dbg( p_dec, "the decoder is ready to search for metadata." );
         break;
     case FLAC__STREAM_DECODER_READ_METADATA:
-        msg_Err( p_dec, "the decoder is ready to or is in the process of "
+        msg_Dbg( p_dec, "the decoder is ready to or is in the process of "
                  "reading metadata." );
         break;
     case FLAC__STREAM_DECODER_SEARCH_FOR_FRAME_SYNC:
-        msg_Err( p_dec, "the decoder is ready to or is in the process of "
+        msg_Dbg( p_dec, "the decoder is ready to or is in the process of "
                  "searching for the frame sync code." );
         break;
     case FLAC__STREAM_DECODER_READ_FRAME:
-        msg_Err( p_dec, "the decoder is ready to or is in the process of "
+        msg_Dbg( p_dec, "the decoder is ready to or is in the process of "
                  "reading a frame." );
         break;
     case FLAC__STREAM_DECODER_END_OF_STREAM:
-        msg_Err( p_dec, "the decoder has reached the end of the stream." );
+        msg_Dbg( p_dec, "the decoder has reached the end of the stream." );
         break;
     case FLAC__STREAM_DECODER_ABORTED:
-        msg_Err( p_dec, "the decoder was aborted by the read callback." );
+        msg_Warn( p_dec, "the decoder was aborted by the read callback." );
         break;
     case FLAC__STREAM_DECODER_UNPARSEABLE_STREAM:
-        msg_Err( p_dec, "the decoder encountered reserved fields in use "
+        msg_Warn( p_dec, "the decoder encountered reserved fields in use "
                  "in the stream." );
         break;
     case FLAC__STREAM_DECODER_MEMORY_ALLOCATION_ERROR:
@@ -745,7 +745,7 @@ static void decoder_state_error( decoder_t *p_dec,
         msg_Err( p_dec, "decoder in uninitialized state." );
         break;
     default:
-        msg_Err(p_dec, "unknown error" );
+        msg_Warn(p_dec, "unknown error" );
     }
 }
 #endif
@@ -1115,7 +1115,7 @@ struct encoder_sys_t
     int i_channels;
 
     FLAC__int32 *p_buffer;
-    int         i_buffer;
+    unsigned int i_buffer;
 
     block_t *p_chain;
 
@@ -1207,7 +1207,7 @@ static block_t *Encode( encoder_t *p_enc, aout_buffer_t *p_aout_buf )
 {
     encoder_sys_t *p_sys = p_enc->p_sys;
     block_t *p_chain;
-    int i;
+    unsigned int i;
 
     p_sys->i_pts = p_aout_buf->start_date -
                 (mtime_t)1000000 * (mtime_t)p_sys->i_samples_delay /