diff options
| author | Ivan Kalvachev <ikalvachev@gmail.com> | 2013-12-14 21:29:15 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-12-22 22:03:47 +0100 |
| commit | 1c63aed232febf4404659bf006237ee4f7f17c9c (patch) | |
| tree | 8024b37b264802e26a7c481692b6ea1566e83284 /libavcodec/mpegvideo.c | |
| parent | c19f193c6b239782b10bd9df117da2e50468edf9 (diff) | |
| download | ffmpeg-1c63aed232febf4404659bf006237ee4f7f17c9c.tar.gz | |
Convert XvMC to hwaccel v3
Signed-off-by: Ivan Kalvachev <ikalvachev@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mpegvideo.c')
| -rw-r--r-- | libavcodec/mpegvideo.c | 26 |
1 files changed, 3 insertions, 23 deletions
diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index e96791af6b..cf7178466b 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -39,7 +39,6 @@ #include "mpegvideo.h" #include "mjpegenc.h" #include "msmpeg4.h" -#include "xvmc_internal.h" #include "thread.h" #include <limits.h> @@ -1673,28 +1672,12 @@ int ff_MPV_frame_start(MpegEncContext *s, AVCodecContext *avctx) update_noise_reduction(s); } -#if FF_API_XVMC -FF_DISABLE_DEPRECATION_WARNINGS - if (CONFIG_MPEG_XVMC_DECODER && s->avctx->xvmc_acceleration) - return ff_xvmc_field_start(s, avctx); -FF_ENABLE_DEPRECATION_WARNINGS -#endif /* FF_API_XVMC */ - return 0; } /* called after a frame has been decoded. */ void ff_MPV_frame_end(MpegEncContext *s) { -#if FF_API_XVMC -FF_DISABLE_DEPRECATION_WARNINGS - /* redraw edges for the frame if decoding didn't complete */ - // just to make sure that all data is rendered. - if (CONFIG_MPEG_XVMC_DECODER && s->avctx->xvmc_acceleration) { - ff_xvmc_field_end(s); - } else -FF_ENABLE_DEPRECATION_WARNINGS -#endif /* FF_API_XVMC */ if ((s->er.error_count || !(s->avctx->codec->capabilities&CODEC_CAP_DRAW_HORIZ_BAND)) && !s->avctx->hwaccel && !(s->avctx->codec->capabilities & CODEC_CAP_HWACCEL_VDPAU) && @@ -2618,14 +2601,11 @@ void MPV_decode_mb_internal(MpegEncContext *s, int16_t block[12][64], { const int mb_xy = s->mb_y * s->mb_stride + s->mb_x; -#if FF_API_XVMC -FF_DISABLE_DEPRECATION_WARNINGS - if(CONFIG_MPEG_XVMC_DECODER && s->avctx->xvmc_acceleration){ - ff_xvmc_decode_mb(s);//xvmc uses pblocks + if (CONFIG_XVMC && + s->avctx->hwaccel && s->avctx->hwaccel->decode_mb) { + s->avctx->hwaccel->decode_mb(s);//xvmc uses pblocks return; } -FF_ENABLE_DEPRECATION_WARNINGS -#endif /* FF_API_XVMC */ if(s->avctx->debug&FF_DEBUG_DCT_COEFF) { /* print DCT coefficients */ |