Ticket #3144: no-xvmc-1.diff

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

  • mplayer-export-2013-11-16/ffmpeg/libavutil/version.h 

    diff -up mplayer-export-2013-11-16/ffmpeg/libavutil/version.h.xvmc mplayer-export-2013-11-16/ffmpeg/libavutil/version.h
    old new  
    145145#define FF_API_OLD_OPENCL               (LIBAVUTIL_VERSION_MAJOR < 53)
    146146#endif
    147147#ifndef FF_API_XVMC
    148 #define FF_API_XVMC                     (LIBAVUTIL_VERSION_MAJOR < 53)
     148#define FF_API_XVMC                     (LIBAVUTIL_VERSION_MAJOR < 50)
    149149#endif
    150150
    151151/**

  • mplayer-export-2013-11-16/fmt-conversion.c 

    diff -up mplayer-export-2013-11-16/fmt-conversion.c.xvmc mplayer-export-2013-11-16/fmt-conversion.c
    old new static const struct {  
    135135    { IMGFMT_444P,       AV_PIX_FMT_YUVJ444P },
    136136    { IMGFMT_440P,       AV_PIX_FMT_YUVJ440P },
    137137
     138#if CONFIG_XVMC
    138139    { IMGFMT_XVMC_MOCO_MPEG2, AV_PIX_FMT_XVMC_MPEG2_MC },
    139140    { IMGFMT_XVMC_IDCT_MPEG2, AV_PIX_FMT_XVMC_MPEG2_IDCT },
     141#endif /* CONFIG_XVMC */
     142
    140143    { IMGFMT_VDPAU_MPEG1,     AV_PIX_FMT_VDPAU_MPEG1 },
    141144    { IMGFMT_VDPAU_MPEG2,     AV_PIX_FMT_VDPAU_MPEG2 },
    142145    { IMGFMT_VDPAU_H264,      AV_PIX_FMT_VDPAU_H264 },

  • mplayer-export-2013-11-16/libmpcodecs/vd_ffmpeg.c 

    diff -up mplayer-export-2013-11-16/libmpcodecs/vd_ffmpeg.c.xvmc mplayer-export-2013-11-16/libmpcodecs/vd_ffmpeg.c
    old new static int init(sh_video_t *sh){  
    477477        avctx->bits_per_coded_sample= sh->bih->biBitCount;
    478478
    479479    set_dr_slice_settings(avctx, lavc_codec);
     480#if CONFIG_XVMC
    480481    if(lavc_codec->capabilities & CODEC_CAP_HWACCEL)
    481482        // HACK around badly placed checks in mpeg_mc_decode_init
    482483        set_format_params(avctx, PIX_FMT_XVMC_MPEG2_IDCT);
     484#endif /* CONFIG_XVMC */
    483485    avctx->thread_count = lavc_param_threads;
    484486    avctx->thread_type = FF_THREAD_FRAME | FF_THREAD_SLICE;
    485487