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

[Michael Niedermayer CVS]

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

Modified Files:
	vd_ffmpeg.c 
Log Message:
disable slices & dr1 if motion vector vissualization is used, still doesnt work though, maybe i should reverse the last mv vis patch ...


Index: vd_ffmpeg.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vd_ffmpeg.c,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -r1.115 -r1.116
--- vd_ffmpeg.c	30 Dec 2003 18:24:19 -0000	1.115
+++ vd_ffmpeg.c	1 Jan 2004 15:56:00 -0000	1.116
@@ -165,10 +165,10 @@
 	return 0;
     }
 
-    if(vd_use_slices && lavc_codec->capabilities&CODEC_CAP_DRAW_HORIZ_BAND)
+    if(vd_use_slices && (lavc_codec->capabilities&CODEC_CAP_DRAW_HORIZ_BAND) && !lavc_param_vismv)
 	ctx->do_slices=1;
  
-    if(lavc_codec->capabilities&CODEC_CAP_DR1)
+    if(lavc_codec->capabilities&CODEC_CAP_DR1 && !lavc_param_vismv)
 	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;