Replace remaining occurrences of CODEC_TYPE_* with AVMEDIA_TYPE*

[ffmpeg] / libavcodec / ac3enc_fixed.c

diff --git a/libavcodec/ac3enc_fixed.c b/libavcodec/ac3enc_fixed.c
index 6505b7a0eac3bcd174249d85375f1f4bc69c3592..90e148b94967dcf8a81e9569e766c5a474680aa0 100644 (file)
--- a/libavcodec/ac3enc_fixed.c
+++ b/libavcodec/ac3enc_fixed.c
@@ -26,6 +26,7 @@
  * fixed-point AC-3 encoder.
  */
 
+#undef CONFIG_AC3ENC_FLOAT
 #include "ac3enc.c"
 
 
@@ -250,7 +251,7 @@ static void mdct512(AC3MDCTContext *mdct, int32_t *out, int16_t *in)
 /**
  * Apply KBD window to input samples prior to MDCT.
  */
-static void apply_window(int16_t *output, const int16_t *input,
+static void apply_window(DSPContext *dsp, int16_t *output, const int16_t *input,
                          const int16_t *window, int n)
 {
     int i;
@@ -318,6 +319,17 @@ static int normalize_samples(AC3EncodeContext *s)
 }
 
 
+/**
+ * Scale MDCT coefficients from float to fixed-point.
+ */
+static void scale_coefficients(AC3EncodeContext *s)
+{
+    /* scaling/conversion is obviously not needed for the fixed-point encoder
+       since the coefficients are already fixed-point. */
+    return;
+}
+
+
 #ifdef TEST
 /*************************************************************************/
 /* TEST */
@@ -413,8 +425,8 @@ int main(void)
 #endif /* TEST */
 
 
-AVCodec ac3_encoder = {
-    "ac3",
+AVCodec ff_ac3_fixed_encoder = {
+    "ac3_fixed",
     AVMEDIA_TYPE_AUDIO,
     CODEC_ID_AC3,
     sizeof(AC3EncodeContext),