[Mplayer-cvslog] CVS: main/libmpcodecs vd_ffmpeg.c,1.131,1.132

[Michael Niedermayer CVS]

CVS change done by Michael Niedermayer CVS

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

Modified Files:
	vd_ffmpeg.c 
Log Message:
disable direct rendering for h264
until now we did try with dr, and disabled it if more then 1 reference frame was used, but that rarely resulted in dr+h264 and its not guranteed to work as stride may end up different, and remocing CODEC_CAP_DR1 from h264 in ffmpeg isnt correct either as the h264 codec does support it


Index: vd_ffmpeg.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vd_ffmpeg.c,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -r1.131 -r1.132
--- vd_ffmpeg.c	2 Sep 2004 16:52:13 -0000	1.131
+++ vd_ffmpeg.c	7 Sep 2004 01:20:19 -0000	1.132
@@ -188,7 +188,7 @@
     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 && !do_vis_debug)
+    if(lavc_codec->capabilities&CODEC_CAP_DR1 && !do_vis_debug && lavc_codec->id != CODEC_ID_H264)
 	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;