diff options
| author | Diego Biurrun <diego@biurrun.de> | 2014-08-04 03:39:34 -0700 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2014-08-04 11:08:35 -0700 |
| commit | 990e2f3555bb0adae122d3599938ddcfee46e2d1 (patch) | |
| tree | 54fff1600ed6e2709e737ec49f9ab0a10f5542f3 | |
| parent | 086a541857812b2e0435db38fbabfddc7d19e53c (diff) | |
| download | ffmpeg-990e2f3555bb0adae122d3599938ddcfee46e2d1.tar.gz | |
avcodec: Suppress deprecation warnings from DTG code scheduled for removal
| -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 c84fd91b60..a181fcccb9 100644 --- a/libavcodec/mpeg12dec.c +++ b/libavcodec/mpeg12dec.c @@ -2250,7 +2250,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 66b1b20e96..a658f3eb7b 100644 --- a/libavcodec/pthread_frame.c +++ b/libavcodec/pthread_frame.c @@ -36,12 +36,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" @@ -188,7 +190,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; |