Merge commit '8f12ef9860d0e164e4647fd5d5cebdb3cfb34a79'

[ffmpeg] / libavutil / frame.c

diff --git a/libavutil/frame.c b/libavutil/frame.c
index 3a84811b874bdc3a0c53576531dd90c42f0e66d3..f403fd75ddfdf67a758daa911fb9fd6b5825e434 100644 (file)
--- a/libavutil/frame.c
+++ b/libavutil/frame.c
@@ -289,11 +289,6 @@ static int frame_copy_props(AVFrame *dst, const AVFrame *src, int force_copy)
     dst->palette_has_changed    = src->palette_has_changed;
     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;
     dst->pkt_pos                = src->pkt_pos;