diff options
| author | James Almer <jamrial@gmail.com> | 2017-10-23 22:31:50 +0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-10-23 22:31:50 +0300 |
| commit | 2ccd00dabd5ab4fa2550377be823a521df80c141 (patch) | |
| tree | 6a91d11df569a791c8925cb7efc5c57a09ca152f /libavcodec/pthread_frame.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/pthread_frame.c')
| -rw-r--r-- | libavcodec/pthread_frame.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/libavcodec/pthread_frame.c b/libavcodec/pthread_frame.c index 2c702c7372..ddfd07d292 100644 --- a/libavcodec/pthread_frame.c +++ b/libavcodec/pthread_frame.c @@ -262,11 +262,6 @@ static int update_context_from_thread(AVCodecContext *dst, AVCodecContext *src, dst->bits_per_coded_sample = src->bits_per_coded_sample; dst->sample_aspect_ratio = src->sample_aspect_ratio; -#if FF_API_AFD -FF_DISABLE_DEPRECATION_WARNINGS - dst->dtg_active_format = src->dtg_active_format; -FF_ENABLE_DEPRECATION_WARNINGS -#endif /* FF_API_AFD */ dst->profile = src->profile; dst->level = src->level; |