Merge commit '6d4d3fee63c46d921c4870feab79269af94e84e1'

[ffmpeg] / libavcodec / h264_sei.c

diff --git a/libavcodec/h264_sei.c b/libavcodec/h264_sei.c
index 8e1697a31e4910cdac9efc8e825a869bf73bd914..b6ec5c7de94dda8586ed91f453a9dd80cf9778f3 100644 (file)
--- a/libavcodec/h264_sei.c
+++ b/libavcodec/h264_sei.c
@@ -132,7 +132,13 @@ static int decode_user_data_itu_t_t35(H264Context *h, int size)
                     return -1;
                 skip_bits(&h->gb, 4);
                 dtg_active_format = get_bits(&h->gb, 4);
+#if FF_API_AFD
+FF_DISABLE_DEPRECATION_WARNINGS
                 h->avctx->dtg_active_format = dtg_active_format;
+FF_ENABLE_DEPRECATION_WARNINGS
+#endif /* FF_API_AFD */
+                h->has_afd = 1;
+                h->afd     = dtg_active_format;
             } else {
                 skip_bits(&h->gb, 6);
             }