avcodec/[e]ac3enc: Don't invade CONFIG_ namespace

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>

diff --git a/libavcodec/ac3enc.h b/libavcodec/ac3enc.h
index b4e566b4eff81938eac95a144137e6bd62d8a721..6d8f186a1a1bfb3ea10833514973e50eda3b262a 100644 (file)
--- a/libavcodec/ac3enc.h
+++ b/libavcodec/ac3enc.h
@@ -41,8 +41,8 @@
 #include "put_bits.h"
 #include "audiodsp.h"
 
-#ifndef CONFIG_AC3ENC_FLOAT
-#define CONFIG_AC3ENC_FLOAT 0
+#ifndef AC3ENC_FLOAT
+#define AC3ENC_FLOAT 0
 #endif
 
 #define OFFSET(param) offsetof(AC3EncodeContext, options.param)
@@ -52,7 +52,7 @@
 #define AC3ENC_TYPE_AC3         1
 #define AC3ENC_TYPE_EAC3        2
 
-#if CONFIG_AC3ENC_FLOAT
+#if AC3ENC_FLOAT
 #define AC3_NAME(x) ff_ac3_float_ ## x
 #define MAC_COEF(d,a,b) ((d)+=(a)*(b))
 #define COEF_MIN (-16777215.0/16777216.0)

diff --git a/libavcodec/ac3enc_fixed.c b/libavcodec/ac3enc_fixed.c
index 879e364d4e067a333a7a0da58ab33f6e3be99a2b..7818dd8c3509277639c269998f1b032dbcc2ce0c 100644 (file)
--- a/libavcodec/ac3enc_fixed.c
+++ b/libavcodec/ac3enc_fixed.c
@@ -27,7 +27,7 @@
  */
 
 #define FFT_FLOAT 0
-#undef CONFIG_AC3ENC_FLOAT
+#define AC3ENC_FLOAT 0
 #include "internal.h"
 #include "audiodsp.h"
 #include "ac3enc.h"

diff --git a/libavcodec/ac3enc_float.c b/libavcodec/ac3enc_float.c
index ef23b417cf3345b4d8fdf1509b91e1d27585fdf0..45bfed34f9ac3dbc39355a9fbbfe847874587e74 100644 (file)
--- a/libavcodec/ac3enc_float.c
+++ b/libavcodec/ac3enc_float.c
@@ -26,7 +26,7 @@
  * floating-point AC-3 encoder.
  */
 
-#define CONFIG_AC3ENC_FLOAT 1
+#define AC3ENC_FLOAT 1
 #include "internal.h"
 #include "audiodsp.h"
 #include "ac3enc.h"

diff --git a/libavcodec/ac3enc_template.c b/libavcodec/ac3enc_template.c
index e8b964aa6acc1974b708bdefc4d37d5e85c41ad7..0d99bd84c823736b186a23d375eeab77645cdae8 100644 (file)
--- a/libavcodec/ac3enc_template.c
+++ b/libavcodec/ac3enc_template.c
@@ -91,7 +91,7 @@ static void apply_mdct(AC3EncodeContext *s)
             AC3Block *block = &s->blocks[blk];
             const SampleType *input_samples = &s->planar_samples[ch][blk * AC3_BLOCK_SIZE];
 
-#if CONFIG_AC3ENC_FLOAT
+#if AC3ENC_FLOAT
             s->fdsp->vector_fmul(s->windowed_samples, input_samples,
                                 s->mdct_window, AC3_WINDOW_SIZE);
 #else
@@ -115,7 +115,7 @@ static void apply_mdct(AC3EncodeContext *s)
 static void apply_channel_coupling(AC3EncodeContext *s)
 {
     LOCAL_ALIGNED_16(CoefType, cpl_coords,      [AC3_MAX_BLOCKS], [AC3_MAX_CHANNELS][16]);
-#if CONFIG_AC3ENC_FLOAT
+#if AC3ENC_FLOAT
     LOCAL_ALIGNED_16(int32_t, fixed_cpl_coords, [AC3_MAX_BLOCKS], [AC3_MAX_CHANNELS][16]);
 #else
     int32_t (*fixed_cpl_coords)[AC3_MAX_CHANNELS][16] = cpl_coords;
@@ -125,7 +125,7 @@ static void apply_channel_coupling(AC3EncodeContext *s)
     int cpl_start, num_cpl_coefs;
 
     memset(cpl_coords,       0, AC3_MAX_BLOCKS * sizeof(*cpl_coords));
-#if CONFIG_AC3ENC_FLOAT
+#if AC3ENC_FLOAT
     memset(fixed_cpl_coords, 0, AC3_MAX_BLOCKS * sizeof(*cpl_coords));
 #endif
 
@@ -266,7 +266,7 @@ static void apply_channel_coupling(AC3EncodeContext *s)
         if (!block->cpl_in_use)
             continue;
 
-#if CONFIG_AC3ENC_FLOAT
+#if AC3ENC_FLOAT
         s->ac3dsp.float_to_fixed24(fixed_cpl_coords[blk][1],
                                    cpl_coords[blk][1],
                                    s->fbw_channels * 16);

diff --git a/libavcodec/eac3enc.c b/libavcodec/eac3enc.c
index 00721aa645b25b0192b521b51e30ca32139b303d..585588a48015ab46ed1d08eab67cb47074006193 100644 (file)
--- a/libavcodec/eac3enc.c
+++ b/libavcodec/eac3enc.c
@@ -24,7 +24,7 @@
  * E-AC-3 encoder
  */
 
-#define CONFIG_AC3ENC_FLOAT 1
+#define AC3ENC_FLOAT 1
 
 #include "libavutil/attributes.h"
 #include "ac3enc.h"