[Mplayer-cvslog] CVS: main/libmpcodecs vd_ffmpeg.c,1.74,1.75 ve_lavc.c,1.42,1.43

[Michael Niedermayer CVS]

Update of /cvsroot/mplayer/main/libmpcodecs
In directory mail:/var/tmp.root/cvs-serv10089

Modified Files:
	vd_ffmpeg.c ve_lavc.c 
Log Message:
specific debug output support


Index: vd_ffmpeg.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vd_ffmpeg.c,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- vd_ffmpeg.c	4 Dec 2002 11:53:47 -0000	1.74
+++ vd_ffmpeg.c	4 Dec 2002 12:41:57 -0000	1.75
@@ -70,6 +70,7 @@
 static int lavc_param_gray=0;
 static int lavc_param_vstats=0;
 static int lavc_param_idct_algo=0;
+static int lavc_param_debug=0;
 
 struct config lavc_decode_opts_conf[]={
 	{"bug", &lavc_param_workaround_bugs, CONF_TYPE_INT, CONF_RANGE, -1, 99, NULL},
@@ -78,6 +79,9 @@
 	{"idct", &lavc_param_idct_algo, CONF_TYPE_INT, CONF_RANGE, 0, 99, NULL},
 	{"ec", &lavc_param_error_concealment, CONF_TYPE_INT, CONF_RANGE, 0, 99, NULL},
 	{"vstats", &lavc_param_vstats, CONF_TYPE_FLAG, 0, 0, 1, NULL},
+#if LIBAVCODEC_BUILD >= 4642
+	{"debug", &lavc_param_debug, CONF_TYPE_INT, CONF_RANGE, 0, 9999999, NULL},
+#endif
 	{NULL, NULL, 0, 0, 0, 0, NULL}
 };
 
@@ -164,7 +168,9 @@
     avctx->fourcc= sh->format;
     avctx->idct_algo= lavc_param_idct_algo;
     avctx->error_concealment= lavc_param_error_concealment;
-    
+#if LIBAVCODEC_BUILD >= 4642
+    avctx->debug= lavc_param_debug;
+#endif    
     mp_dbg(MSGT_DECVIDEO,MSGL_DBG2,"libavcodec.size: %d x %d\n",avctx->width,avctx->height);
     /* AVRn stores huffman table in AVI header */
     /* Pegasus MJPEG stores it also in AVI header, but it uses the common

Index: ve_lavc.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/ve_lavc.c,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- ve_lavc.c	4 Dec 2002 11:53:47 -0000	1.42
+++ ve_lavc.c	4 Dec 2002 12:41:57 -0000	1.43
@@ -93,6 +93,7 @@
 static int lavc_param_interlaced_dct= 0;
 static int lavc_param_prediction_method= FF_PRED_LEFT;
 static char *lavc_param_format="YV12";
+static int lavc_param_debug= 0;
 
 #include "cfgparser.h"
 
@@ -148,6 +149,9 @@
         {"idct", &lavc_param_idct, CONF_TYPE_INT, CONF_RANGE, 0, 20, NULL},
         {"pred", &lavc_param_prediction_method, CONF_TYPE_INT, CONF_RANGE, 0, 20, NULL},
         {"format", &lavc_param_format, CONF_TYPE_STRING, 0, 0, 0, NULL},
+#if LIBAVCODEC_BUILD >= 4642
+        {"debug", &lavc_param_debug, CONF_TYPE_INT, CONF_RANGE, 0, 100000000, NULL},
+#endif 
 	{NULL, NULL, 0, 0, 0, 0, NULL}
 };
 #endif
@@ -214,6 +218,9 @@
     lavc_venc_context->rc_buffer_size= lavc_param_rc_buffer_size*1000;
     lavc_venc_context->rc_buffer_aggressivity= lavc_param_rc_buffer_aggressivity;
     lavc_venc_context->rc_initial_cplx= lavc_param_rc_initial_cplx;
+#if LIBAVCODEC_BUILD >= 4642
+    lavc_venc_context->debug= lavc_param_debug;
+#endif    
 
     p= lavc_param_rc_override_string;
     for(i=0; p; i++){