Merge remote-tracking branch 'dwbuiten/master'

[ffmpeg] / libavcodec / dcaenc.c

diff --git a/libavcodec/dcaenc.c b/libavcodec/dcaenc.c
index f0b6f8111ea32de62b5eb29aee72d456f2d6063e..fd00b4f0b1997bd3063ed2e1bd9bc6016b6a4b93 100644 (file)
--- a/libavcodec/dcaenc.c
+++ b/libavcodec/dcaenc.c
@@ -30,6 +30,7 @@
 #include "put_bits.h"
 #include "dcaenc.h"
 #include "dcadata.h"
+#include "dca.h"
 
 #undef NDEBUG
 
@@ -569,13 +570,13 @@ static int encode_init(AVCodecContext *avctx)
     }
 
     for (i = 0; i < 16; i++) {
-        if (dca_sample_rates[i] && (dca_sample_rates[i] == avctx->sample_rate))
+        if (avpriv_dca_sample_rates[i] && (avpriv_dca_sample_rates[i] == avctx->sample_rate))
             break;
     }
     if (i == 16) {
         av_log(avctx, AV_LOG_ERROR, "Sample rate %iHz not supported, only ", avctx->sample_rate);
         for (i = 0; i < 16; i++)
-            av_log(avctx, AV_LOG_ERROR, "%d, ", dca_sample_rates[i]);
+            av_log(avctx, AV_LOG_ERROR, "%d, ", avpriv_dca_sample_rates[i]);
         av_log(avctx, AV_LOG_ERROR, "supported.\n");
         return -1;
     }
@@ -596,6 +597,7 @@ AVCodec ff_dca_encoder = {
     .init           = encode_init,
     .encode2        = encode_frame,
     .capabilities   = CODEC_CAP_EXPERIMENTAL,
-    .sample_fmts    = (const enum AVSampleFormat[]){AV_SAMPLE_FMT_S16,AV_SAMPLE_FMT_NONE},
+    .sample_fmts    = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_S16,
+                                                     AV_SAMPLE_FMT_NONE },
     .long_name      = NULL_IF_CONFIG_SMALL("DCA (DTS Coherent Acoustics)"),
 };