[Mplayer-cvslog] CVS: main/libmpcodecs vd_ffmpeg.c,1.33,1.34

[Michael Niedermayer]

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

Modified Files:
	vd_ffmpeg.c 
Log Message:
fallback to slices, if dr1 fails (bug found by kabi)


Index: vd_ffmpeg.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vd_ffmpeg.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- vd_ffmpeg.c	16 Jul 2002 12:04:30 -0000	1.33
+++ vd_ffmpeg.c	16 Jul 2002 23:42:44 -0000	1.34
@@ -311,7 +311,8 @@
         flags|=(!avctx->hurry_up && ctx->do_slices) ?
                 MP_IMGFLAG_DRAW_CALLBACK:0;
     else
-        flags|= MP_IMGFLAG_PRESERVE|MP_IMGFLAG_READABLE;
+        flags|= MP_IMGFLAG_PRESERVE|MP_IMGFLAG_READABLE
+                | (ctx->do_slices ? MP_IMGFLAG_DRAW_CALLBACK : 0);
 
 #if LIBAVCODEC_BUILD > 4616
     if(avctx->has_b_frames){
@@ -345,6 +346,7 @@
 
     avctx->dr_opaque_frame = mpi;
     avctx->dr_ip_buffer_count=2; //FIXME
+//printf("%X\n", (int)mpi->planes[0]);
 }
 #endif