diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-05 01:15:00 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-05 01:15:11 +0200 |
| commit | debb88776c3da9587bfc4ee07542490e51592a37 (patch) | |
| tree | 36d67ccf6967750aaaeea4535620a247a7759395 /libavcodec | |
| parent | 6b646fb9e2cea927a744dabb7c412a13a13d219d (diff) | |
| parent | 990e2f3555bb0adae122d3599938ddcfee46e2d1 (diff) | |
| download | ffmpeg-debb88776c3da9587bfc4ee07542490e51592a37.tar.gz | |
Merge commit '990e2f3555bb0adae122d3599938ddcfee46e2d1'
* commit '990e2f3555bb0adae122d3599938ddcfee46e2d1':
avcodec: Suppress deprecation warnings from DTG code scheduled for removal
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/mpeg12dec.c | 2 | ||||
| -rw-r--r-- | libavcodec/pthread_frame.c | 6 |
2 files changed, 8 insertions, 0 deletions
diff --git a/libavcodec/mpeg12dec.c b/libavcodec/mpeg12dec.c index 3b769dfb77..85bb7b0705 100644 --- a/libavcodec/mpeg12dec.c +++ b/libavcodec/mpeg12dec.c @@ -2306,7 +2306,9 @@ static void mpeg_decode_user_data(AVCodecContext *avctx, 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; diff --git a/libavcodec/pthread_frame.c b/libavcodec/pthread_frame.c index 2a67f4d267..1db46fcf96 100644 --- a/libavcodec/pthread_frame.c +++ b/libavcodec/pthread_frame.c @@ -38,12 +38,14 @@ #include "internal.h" #include "pthread_internal.h" #include "thread.h" +#include "version.h" #include "libavutil/avassert.h" #include "libavutil/buffer.h" #include "libavutil/common.h" #include "libavutil/cpu.h" #include "libavutil/frame.h" +#include "libavutil/internal.h" #include "libavutil/log.h" #include "libavutil/mem.h" @@ -208,7 +210,11 @@ 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; |