[MPlayer-dev-eng] [PATCH]Fix decoding with -vc ffvc1vdpau

[Carl Eugen Hoyos]

Hi!

Attached patch fixes decoding with -vc ffvc1vdpau and -vc ffwmv3vdpau

Please comment, Carl Eugen
-------------- next part --------------
Index: libmpcodecs/vd_ffmpeg.c
===================================================================
--- libmpcodecs/vd_ffmpeg.c	(revision 28734)
+++ libmpcodecs/vd_ffmpeg.c	(working copy)
@@ -916,7 +916,7 @@
         avctx->draw_horiz_band = draw_slice;
         mp_msg(MSGT_DECVIDEO, MSGL_INFO, MSGTR_MPCODECS_XVMCAcceleratedMPEG2);
         assert(ctx->do_dr1);//these are must to!
-        assert(ctx->do_slices); //it is (vo_)ffmpeg bug if this fails
+        assert(!IMGFMT_IS_XVMC(imgfmt) || ctx->do_slices);
         avctx->slice_flags=SLICE_FLAG_CODED_ORDER|SLICE_FLAG_ALLOW_FIELD;
     }
     return selected_format;