diff options
| author | James Almer <jamrial@gmail.com> | 2017-10-23 16:31:50 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-10-23 16:31:50 -0300 |
| commit | 2ccd00dabd5ab4fa2550377be823a521df80c141 (patch) | |
| tree | 6a91d11df569a791c8925cb7efc5c57a09ca152f /libavcodec/h264dec.c | |
| parent | 5a2e581879b8901b8660b82ff8d333d18fc629ff (diff) | |
| parent | 5182a28b5de060c51c21b36053ab205bfbbbbe31 (diff) | |
Merge commit '5182a28b5de060c51c21b36053ab205bfbbbbe31'
* commit '5182a28b5de060c51c21b36053ab205bfbbbbe31':
lavc: Drop deprecated global afd field
Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavcodec/h264dec.c')
| -rw-r--r-- | libavcodec/h264dec.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/libavcodec/h264dec.c b/libavcodec/h264dec.c index b11a5ea636..5abaaabf9d 100644 --- a/libavcodec/h264dec.c +++ b/libavcodec/h264dec.c @@ -707,11 +707,6 @@ static int decode_nal_units(H264Context *h, const uint8_t *buf, int buf_size) h->has_recovery_point = h->has_recovery_point || h->sei.recovery_point.recovery_frame_cnt != -1; if (avctx->debug & FF_DEBUG_GREEN_MD) debug_green_metadata(&h->sei.green_metadata, h->avctx); -#if FF_API_AFD -FF_DISABLE_DEPRECATION_WARNINGS - h->avctx->dtg_active_format = h->sei.afd.active_format_description; -FF_ENABLE_DEPRECATION_WARNINGS -#endif /* FF_API_AFD */ if (ret < 0 && (h->avctx->err_recognition & AV_EF_EXPLODE)) goto end; break; |