diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-28 22:47:08 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-28 22:47:37 +0100 |
| commit | 3adb825650965492f5f874c027b426c0077b523d (patch) | |
| tree | 57dbfb3f44c8f6362c55b7d1ba523d730ad92ed1 /libavcodec | |
| parent | f21ca39e8156c7957348bf37e9dc9d311488ae14 (diff) | |
| parent | cf7860db608df7c76471d8b61f07abbd5aad8dd5 (diff) | |
Merge commit 'cf7860db608df7c76471d8b61f07abbd5aad8dd5'
* commit 'cf7860db608df7c76471d8b61f07abbd5aad8dd5':
x86: dsputil: Suppress deprecation warnings for XvMC bits
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/x86/dsputil_init.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libavcodec/x86/dsputil_init.c b/libavcodec/x86/dsputil_init.c index 89f4068462..46eebaffff 100644 --- a/libavcodec/x86/dsputil_init.c +++ b/libavcodec/x86/dsputil_init.c @@ -22,6 +22,7 @@ #include "config.h" #include "libavutil/attributes.h" #include "libavutil/cpu.h" +#include "libavutil/internal.h" #include "libavutil/x86/asm.h" #include "libavutil/x86/cpu.h" #include "libavcodec/dsputil.h" @@ -602,8 +603,10 @@ static av_cold void dsputil_init_sse(DSPContext *c, AVCodecContext *avctx, if (!high_bit_depth) { #if FF_API_XVMC +FF_DISABLE_DEPRECATION_WARNINGS if (!(CONFIG_MPEG_XVMC_DECODER && avctx->xvmc_acceleration > 1)) { /* 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; |