OSDN Git Service

x86: dsputil: Suppress deprecation warnings for XvMC bits
authorDiego Biurrun <diego@biurrun.de>
Mon, 25 Nov 2013 18:57:13 +0000 (18:57 +0000)
committerVittorio Giovara <vittorio.giovara@gmail.com>
Thu, 28 Nov 2013 15:04:30 +0000 (16:04 +0100)
These parts are scheduled for removal on the next version bump.

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
libavcodec/x86/dsputil_init.c

index aa4e37b..2ac9351 100644 (file)
@@ -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;