summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2013-11-25 18:57:13 +0000
committerVittorio Giovara <vittorio.giovara@gmail.com>2013-11-28 16:04:30 +0100
commitcf7860db608df7c76471d8b61f07abbd5aad8dd5 (patch)
tree6319e48ec04a8a40e47d29b3c89fb26292f111d2
parentd1916d13e28b87f4b1b214231149e12e1d536b4b (diff)
downloadffmpeg-streaming-cf7860db608df7c76471d8b61f07abbd5aad8dd5.zip
ffmpeg-streaming-cf7860db608df7c76471d8b61f07abbd5aad8dd5.tar.gz
x86: dsputil: Suppress deprecation warnings for XvMC bits
These parts are scheduled for removal on the next version bump. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
-rw-r--r--libavcodec/x86/dsputil_init.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/libavcodec/x86/dsputil_init.c b/libavcodec/x86/dsputil_init.c
index aa4e37b..2ac9351 100644
--- a/libavcodec/x86/dsputil_init.c
+++ b/libavcodec/x86/dsputil_init.c
@@ -19,6 +19,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"
@@ -612,8 +613,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;
OpenPOWER on IntegriCloud