summaryrefslogtreecommitdiff
path: root/libavcodec/mpeg12dec.c
diff options
context:
space:
mode:
authorAndreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>2015-08-08 10:41:33 +0200
committerAndreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>2015-08-22 19:16:14 +0200
commit095347ffe4c73143dbeb7b05cde8891fd1289389 (patch)
tree7f3f71dd67f7f973990281a26e7beebe59f20829 /libavcodec/mpeg12dec.c
parent805f38b4d618811e2f09625c87f42a1d3fd492d2 (diff)
disable deprecation warnings in deprecated code
Reviewed-by: wm4 <nfxjfg@googlemail.com> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Diffstat (limited to 'libavcodec/mpeg12dec.c')
-rw-r--r--libavcodec/mpeg12dec.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/libavcodec/mpeg12dec.c b/libavcodec/mpeg12dec.c
index 3e5ef0e31e..5f42e95f70 100644
--- a/libavcodec/mpeg12dec.c
+++ b/libavcodec/mpeg12dec.c
@@ -1276,7 +1276,9 @@ static void setup_hwaccel_for_pixfmt(AVCodecContext *avctx)
s->pack_pblocks = 1;
#if FF_API_XVMC
+FF_DISABLE_DEPRECATION_WARNINGS
avctx->xvmc_acceleration = 2;
+FF_ENABLE_DEPRECATION_WARNINGS
#endif /* FF_API_XVMC */
}
}
@@ -2919,6 +2921,7 @@ AVCodec ff_mpegvideo_decoder = {
#if FF_API_XVMC
#if CONFIG_MPEG_XVMC_DECODER
+FF_DISABLE_DEPRECATION_WARNINGS
static av_cold int mpeg_mc_decode_init(AVCodecContext *avctx)
{
if (avctx->active_thread_type & FF_THREAD_SLICE)
@@ -2950,7 +2953,7 @@ AVCodec ff_mpeg_xvmc_decoder = {
AV_CODEC_CAP_DELAY,
.flush = flush,
};
-
+FF_ENABLE_DEPRECATION_WARNINGS
#endif
#endif /* FF_API_XVMC */