[Mplayer-cvslog] CVS: main/libmpcodecs vd_ffmpeg.c,1.116,1.117

[Michael Niedermayer CVS]

Update of /cvsroot/mplayer/main/libmpcodecs
In directory mail:/tmp/cvs-serv2315

Modified Files:
	vd_ffmpeg.c 
Log Message:
disable dr1&slices for the other vissualizations too


Index: vd_ffmpeg.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vd_ffmpeg.c,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -r1.116 -r1.117
--- vd_ffmpeg.c	1 Jan 2004 15:56:00 -0000	1.116
+++ vd_ffmpeg.c	1 Jan 2004 16:45:06 -0000	1.117
@@ -147,6 +147,7 @@
     AVCodecContext *avctx;
     vd_ffmpeg_ctx *ctx;
     AVCodec *lavc_codec;
+    int do_vis_debug= lavc_param_vismv || (lavc_param_debug&(FF_DEBUG_VIS_MB_TYPE|FF_DEBUG_VIS_QP));
 
     if(!avcodec_inited){
       avcodec_init();
@@ -165,10 +166,10 @@
 	return 0;
     }
 
-    if(vd_use_slices && (lavc_codec->capabilities&CODEC_CAP_DRAW_HORIZ_BAND) && !lavc_param_vismv)
+    if(vd_use_slices && (lavc_codec->capabilities&CODEC_CAP_DRAW_HORIZ_BAND) && !do_vis_debug)
 	ctx->do_slices=1;
  
-    if(lavc_codec->capabilities&CODEC_CAP_DR1 && !lavc_param_vismv)
+    if(lavc_codec->capabilities&CODEC_CAP_DR1 && !do_vis_debug)
 	ctx->do_dr1=1;
     ctx->b_age= ctx->ip_age[0]= ctx->ip_age[1]= 256*256*256*64;
     ctx->ip_count= ctx->b_count= 0;