[SCM] libav/experimental: avcodec: Suppress deprecation warnings from DTG code scheduled for removal

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 990e2f3555bb0adae122d3599938ddcfee46e2d1
Author: Diego Biurrun <diego at biurrun.de>
Date:   Mon Aug 4 03:39:34 2014 -0700

    avcodec: Suppress deprecation warnings from DTG code scheduled for removal

diff --git a/libavcodec/mpeg12dec.c b/libavcodec/mpeg12dec.c
index c84fd91..a181fcc 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 66b1b20..a658f3e 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;

-- 
Libav/FFmpeg packaging