From f326501a65ad1b949f9e623e1665c81e8ce628f8 Mon Sep 17 00:00:00 2001
From: Anton Khirnov <anton@khirnov.net>
Date: Sun, 22 Jan 2012 10:56:42 +0100
Subject: lavc: remove disabled FF_API_DRC_SCALE cruft.

---
 libavcodec/ac3dec.c  |  5 -----
 libavcodec/avcodec.h | 11 -----------
 libavcodec/options.c |  3 ---
 libavcodec/version.h |  3 ---
 4 files changed, 22 deletions(-)

diff --git a/libavcodec/ac3dec.c b/libavcodec/ac3dec.c
index 662ea91d1f..b50ec2abe6 100644
--- a/libavcodec/ac3dec.c
+++ b/libavcodec/ac3dec.c
@@ -174,11 +174,6 @@ static av_cold int ac3_decode_init(AVCodecContext *avctx)
     AC3DecodeContext *s = avctx->priv_data;
     s->avctx = avctx;
 
-#if FF_API_DRC_SCALE
-    if (avctx->drc_scale)
-        s->drc_scale = avctx->drc_scale;
-#endif
-
     ff_ac3_common_init();
     ac3_tables_init();
     ff_mdct_init(&s->imdct_256, 8, 1, 1.0);
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index c647265459..d4a1939f70 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -2597,17 +2597,6 @@ typedef struct AVCodecContext {
     int request_channels;
 #endif
 
-#if FF_API_DRC_SCALE
-    /**
-     * Percentage of dynamic range compression to be applied by the decoder.
-     * The default value is 1.0, corresponding to full compression.
-     * - encoding: unused
-     * - decoding: Set by user.
-     * @deprecated use AC3 decoder private option instead.
-     */
-    attribute_deprecated float drc_scale;
-#endif
-
     /**
      * opaque 64bit number (generally a PTS) that will be reordered and
      * output in AVFrame.reordered_opaque
diff --git a/libavcodec/options.c b/libavcodec/options.c
index 5024829b82..1ccc73fe88 100644
--- a/libavcodec/options.c
+++ b/libavcodec/options.c
@@ -393,9 +393,6 @@ static const AVOption options[]={
 #if FF_API_REQUEST_CHANNELS
 {"request_channels", "set desired number of audio channels", OFFSET(request_channels), AV_OPT_TYPE_INT, {.dbl = DEFAULT }, 0, INT_MAX, A|D},
 #endif
-#if FF_API_DRC_SCALE
-{"drc_scale", "percentage of dynamic range compression to apply", OFFSET(drc_scale), AV_OPT_TYPE_FLOAT, {.dbl = 0.0 }, 0.0, 1.0, A|D},
-#endif
 #if FF_API_LAME_GLOBAL_OPTS
 {"reservoir", "use bit reservoir", 0, AV_OPT_TYPE_CONST, {.dbl = CODEC_FLAG2_BIT_RESERVOIR }, INT_MIN, INT_MAX, A|E, "flags2"},
 #endif
diff --git a/libavcodec/version.h b/libavcodec/version.h
index 63a04dfa2c..363d79a924 100644
--- a/libavcodec/version.h
+++ b/libavcodec/version.h
@@ -41,9 +41,6 @@
 #ifndef FF_API_REQUEST_CHANNELS
 #define FF_API_REQUEST_CHANNELS (LIBAVCODEC_VERSION_MAJOR < 55)
 #endif
-#ifndef FF_API_DRC_SCALE
-#define FF_API_DRC_SCALE        (LIBAVCODEC_VERSION_MAJOR < 54)
-#endif
 #ifndef FF_API_ER
 #define FF_API_ER               (LIBAVCODEC_VERSION_MAJOR < 54)
 #endif
-- 
cgit v1.2.3