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/x86/dsputil_init.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/x86/dsputil_init.c')
| -rw-r--r-- | libavcodec/x86/dsputil_init.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/libavcodec/x86/dsputil_init.c b/libavcodec/x86/dsputil_init.c index 4c9f499021..36fa38fb2a 100644 --- a/libavcodec/x86/dsputil_init.c +++ b/libavcodec/x86/dsputil_init.c @@ -583,17 +583,11 @@ static av_cold void dsputil_init_sse(DSPContext *c, AVCodecContext *avctx, const int high_bit_depth = avctx->bits_per_raw_sample > 8; if (!high_bit_depth) { -#if FF_API_XVMC -FF_DISABLE_DEPRECATION_WARNINGS - if (!(CONFIG_MPEG_XVMC_DECODER && avctx->xvmc_acceleration > 1)) { + if (!(CONFIG_XVMC && avctx->hwaccel && avctx->hwaccel->decode_mb)) { /* XvMCCreateBlocks() may not allocate 16-byte aligned blocks */ -FF_ENABLE_DEPRECATION_WARNINGS -#endif /* FF_API_XVMC */ c->clear_block = ff_clear_block_sse; c->clear_blocks = ff_clear_blocks_sse; -#if FF_API_XVMC } -#endif /* FF_API_XVMC */ } c->vector_clipf = ff_vector_clipf_sse; |