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

[Carl Eugen Hoyos]

Reimar Döffinger <Reimar.Doeffinger <at> stud.uni-karlsruhe.de> writes:

> In light of future changes in FFmpeg, I'd suggest juat setting both
> do_dr1 and do_slices to 1 one.
> The next step would then be to remove the other special-cases that sets
> do_dr1 based on CODEC_CAP_HWACCEL_VDPAU (if that does not work it needs
> to be fixed).

Like the following (inlined)?
Carl Eugen

Index: libmpcodecs/vd_ffmpeg.c
===================================================================
--- libmpcodecs/vd_ffmpeg.c     (revision 28747)
+++ libmpcodecs/vd_ffmpeg.c     (working copy)
@@ -916,7 +916,8 @@
         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
+        ctx->do_slices = 1;
+        assert(!IMGFMT_IS_XVMC(imgfmt) || ctx->do_slices);
         avctx->slice_flags=SLICE_FLAG_CODED_ORDER|SLICE_FLAG_ALLOW_FIELD;
     }
     return selected_format;