summaryrefslogtreecommitdiff
path: root/libavutil
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 /libavutil
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 'libavutil')
-rw-r--r--libavutil/frame.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libavutil/frame.c b/libavutil/frame.c
index 4ae75ef5d2..3a84811b87 100644
--- a/libavutil/frame.c
+++ b/libavutil/frame.c
@@ -290,7 +290,9 @@ static int frame_copy_props(AVFrame *dst, const AVFrame *src, int force_copy)
dst->sample_rate = src->sample_rate;
dst->opaque = src->opaque;
#if FF_API_AVFRAME_LAVC
+FF_DISABLE_DEPRECATION_WARNINGS
dst->type = src->type;
+FF_ENABLE_DEPRECATION_WARNINGS
#endif
dst->pkt_pts = src->pkt_pts;
dst->pkt_dts = src->pkt_dts;