* ffmpeg: added a ffmpeg-debug option (control libavcodec debug

messages).

diff --git a/modules/codec/ffmpeg/ffmpeg.c b/modules/codec/ffmpeg/ffmpeg.c
index 33a3fd4863650b9fc95df4e71596713adaf1c47f..f50b5c90edacfedfa5e527a2cbef638735cf8cb8 100644 (file)
--- a/modules/codec/ffmpeg/ffmpeg.c
+++ b/modules/codec/ffmpeg/ffmpeg.c
@@ -93,6 +93,7 @@ vlc_module_begin();
     add_string( "ffmpeg-pp-name", "default", NULL, LIBAVCODEC_PP_TEXT,
         LIBAVCODEC_PP_LONGTEXT, VLC_TRUE );
 #endif
+    add_integer( "ffmpeg-debug", 0, NULL, DEBUG_TEST, DEBUG_LONGTEST, VLC_TRUE );
 
     /* chroma conversion submodule */
     add_submodule();
@@ -154,6 +155,7 @@ static int OpenDecoder( vlc_object_t *p_this )
 
     /* *** get a p_context *** */
     p_context = avcodec_alloc_context();
+    p_context->debug = config_GetInt( p_dec, "ffmpeg-debug" );
 
     /* Set CPU capabilities */
     p_context->dsp_mask = 0;

diff --git a/modules/codec/ffmpeg/ffmpeg.h b/modules/codec/ffmpeg/ffmpeg.h
index c6cdcc6f6ae2c74b769eec8f523d5f2ac0d7251b..897141198a9357c23b14e426c9c9a7ace2411b8b 100644 (file)
--- a/modules/codec/ffmpeg/ffmpeg.h
+++ b/modules/codec/ffmpeg/ffmpeg.h
@@ -108,6 +108,9 @@ void E_(ClosePostproc)( decoder_t *, void * );
     "Higher levels require considerable more CPU power, but produce " \
     "better looking pictures." )
 
+#define DEBUG_TEST N_( "Debug mask" )
+#define DEBUG_LONGTEST N_( "Set ffmpeg debug mask" )
+
 #define LIBAVCODEC_PP_TEXT N_("ffmpeg postproc filter chains")
 /* FIXME (cut/past from ffmpeg */
 #define LIBAVCODEC_PP_LONGTEXT \