Ticket #3144: no-xvmc-2.diff

File no-xvmc-2.diff, 1.3 KB (added by Vallimar, 13 years ago)

  • mplayer-export-2013-11-16/ffmpeg/libavcodec/old_codec_ids.h 

    diff -up mplayer-export-2013-11-16/ffmpeg/libavcodec/old_codec_ids.h.xvmc mplayer-export-2013-11-16/ffmpeg/libavcodec/old_codec_ids.h
    old new  
    3434    /* video codecs */
    3535    CODEC_ID_MPEG1VIDEO,
    3636    CODEC_ID_MPEG2VIDEO, ///< preferred ID for MPEG-1/2 video decoding
     37#if FF_API_XVMC
    3738    CODEC_ID_MPEG2VIDEO_XVMC,
     39#endif /* FF_API_XVMC */
    3840    CODEC_ID_H261,
    3941    CODEC_ID_H263,
    4042    CODEC_ID_RV10,

  • mplayer-export-2013-11-16/ffmpeg/libavfilter/vf_mp.c 

    diff -up mplayer-export-2013-11-16/ffmpeg/libavfilter/vf_mp.c.xvmc mplayer-export-2013-11-16/ffmpeg/libavfilter/vf_mp.c
    old new static const struct {  
    111111    {IMGFMT_444P,  AV_PIX_FMT_YUVJ444P},
    112112    {IMGFMT_440P,  AV_PIX_FMT_YUVJ440P},
    113113
     114#if FF_API_XVMC
    114115    {IMGFMT_XVMC_MOCO_MPEG2, AV_PIX_FMT_XVMC_MPEG2_MC},
    115116    {IMGFMT_XVMC_IDCT_MPEG2, AV_PIX_FMT_XVMC_MPEG2_IDCT},
     117#endif /* FF_API_XVMC */
     118
    116119    {IMGFMT_VDPAU_MPEG1,     AV_PIX_FMT_VDPAU_MPEG1},
    117120    {IMGFMT_VDPAU_MPEG2,     AV_PIX_FMT_VDPAU_MPEG2},
    118121    {IMGFMT_VDPAU_H264,      AV_PIX_FMT_VDPAU_H264},