Print more debug messages from ffmpeg when using the mux module in VLC.

diff --git a/modules/codec/ffmpeg/ffmpeg.c b/modules/codec/ffmpeg/ffmpeg.c
index 1324f652260ed18e4c39d9d6b2778b036cedb8f0..13db60a5842c6eaa94f85a7ef92503088a398a71 100644 (file)
--- a/modules/codec/ffmpeg/ffmpeg.c
+++ b/modules/codec/ffmpeg/ffmpeg.c
@@ -365,10 +365,10 @@ static void CloseDecoder( vlc_object_t *p_this )
 }
 
 /*****************************************************************************
- * local Functions
+ *
  *****************************************************************************/
-static void LibavcodecCallback( void *p_opaque, int i_level,
-                                const char *psz_format, va_list va )
+void E_(LibavcodecCallback)( void *p_opaque, int i_level,
+                             const char *psz_format, va_list va )
 {
     int i_vlc_level;
     AVCodecContext *p_avctx = (AVCodecContext *)p_opaque;
@@ -416,7 +416,7 @@ static void LibavcodecCallback( void *p_opaque, int i_level,
                               + 18 + 5 );
     snprintf( psz_new_format, strlen(psz_format) + strlen(psz_item_name)
               + 18 + 5, "%s (%s@%p)", psz_format, p_avc->item_name(p_opaque), p_opaque );
-    msg_GenericVa( p_this, MSG_QUEUE_NORMAL,i_vlc_level,
+    msg_GenericVa( p_this, MSG_QUEUE_NORMAL, i_vlc_level,
                     MODULE_STRING, psz_new_format, va );
     free( psz_new_format );
 }
@@ -434,7 +434,7 @@ void E_(InitLibavcodec)( vlc_object_t *p_object )
     {
         avcodec_init();
         avcodec_register_all();
-        av_log_set_callback( LibavcodecCallback );
+        av_log_set_callback( E_(LibavcodecCallback) );
         b_ffmpeginit = 1;
 
         msg_Dbg( p_object, "libavcodec initialized (interface %d )",

diff --git a/modules/codec/ffmpeg/ffmpeg.h b/modules/codec/ffmpeg/ffmpeg.h
index b8cd5868322e7f5b7758195e69f9fa3553aff5b9..5ffa96214010e3c0d8e648399920ba996b0b49c1 100644 (file)
--- a/modules/codec/ffmpeg/ffmpeg.h
+++ b/modules/codec/ffmpeg/ffmpeg.h
@@ -29,6 +29,8 @@ struct AVCodecContext;
 struct AVCodec;
 
 void E_(InitLibavcodec)( vlc_object_t * );
+void E_(LibavcodecCallback)( void *p_opaque, int i_level,
+                             const char *psz_format, va_list va );
 int E_(GetFfmpegCodec) ( vlc_fourcc_t, int *, int *, const char ** );
 int E_(GetVlcFourcc)   ( int, int *, vlc_fourcc_t *, const char ** );
 int E_(GetFfmpegChroma)( vlc_fourcc_t );

diff --git a/modules/codec/ffmpeg/mux.c b/modules/codec/ffmpeg/mux.c
index 3b9cdd4fdcda8772cf38279f245d35ee12cc290c..72642b3ed0b0f5886ce79101b0852be94a597ad0 100644 (file)
--- a/modules/codec/ffmpeg/mux.c
+++ b/modules/codec/ffmpeg/mux.c
@@ -91,6 +91,7 @@ int E_(OpenMux)( vlc_object_t *p_this )
 
     /* Should we call it only once ? */
     av_register_all();
+    av_log_set_callback( E_(LibavcodecCallback) );
 
     config_ChainParse( p_mux, "ffmpeg-", ppsz_mux_options, p_mux->p_cfg );
 
@@ -215,6 +216,9 @@ static int AddStream( sout_mux_t *p_mux, sout_input_t *p_input )
     }
     codec = stream->codec;
 
+    /* This is used by LibavcodecCallback (ffmpeg.c) to print messages */
+    codec->opaque = (void*)p_mux;
+
     switch( p_input->p_fmt->i_cat )
     {
     case AUDIO_ES: