Mercurial > mplayer.hg

diff fmt-conversion.c @ 37055:6cc356239d4b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Update XvMC implementation to the changes in FFmpeg. Use the common AV_PIX_FMT_XVMC. Remove usage of avctx->xvmc_acceleration and CODEC_CAP_HWACCEL. Return error instead of exiting.
author iive
date Tue, 15 Apr 2014 12:10:59 +0000
parents 20b8efbdfba4
children
line wrap: on
line diff
--- a/fmt-conversion.c	Sat Apr 12 23:45:58 2014 +0000
+++ b/fmt-conversion.c	Tue Apr 15 12:10:59 2014 +0000
@@ -134,9 +134,7 @@
     { IMGFMT_422P,       AV_PIX_FMT_YUVJ422P },
     { IMGFMT_444P,       AV_PIX_FMT_YUVJ444P },
     { IMGFMT_440P,       AV_PIX_FMT_YUVJ440P },
-
-    { IMGFMT_XVMC_MOCO_MPEG2, AV_PIX_FMT_XVMC_MPEG2_MC },
-    { IMGFMT_XVMC_IDCT_MPEG2, AV_PIX_FMT_XVMC_MPEG2_IDCT },
+    { IMGFMT_XVMC_IDCT_MPEG2, AV_PIX_FMT_XVMC },
     { IMGFMT_VDPAU_MPEG1,     AV_PIX_FMT_VDPAU_MPEG1 },
     { IMGFMT_VDPAU_MPEG2,     AV_PIX_FMT_VDPAU_MPEG2 },
     { IMGFMT_VDPAU_H264,      AV_PIX_FMT_VDPAU_H264 },