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/mpeg12dec.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/mpeg12dec.c')
| -rw-r--r-- | libavcodec/mpeg12dec.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/libavcodec/mpeg12dec.c b/libavcodec/mpeg12dec.c index 97885c0be8..f102246f52 100644 --- a/libavcodec/mpeg12dec.c +++ b/libavcodec/mpeg12dec.c @@ -2351,11 +2351,6 @@ static void mpeg_decode_user_data(AVCodecContext *avctx, if (flags & 0x40) { if (buf_end - p < 1) return; -#if FF_API_AFD -FF_DISABLE_DEPRECATION_WARNINGS - avctx->dtg_active_format = p[0] & 0x0f; -FF_ENABLE_DEPRECATION_WARNINGS -#endif /* FF_API_AFD */ s1->has_afd = 1; s1->afd = p[0] & 0x0f; } |