aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfoo86 <foobaz86@gmail.com>2017-07-10 17:11:32 +0300
committerJames Almer <jamrial@gmail.com>2017-07-18 21:04:55 -0300
commit9e37cc11012f23e39b63032b5daac03621340a4f (patch)
tree2ab7fa5e70963420f1536eeeb0915732e8d8895d
parentf6b86b62f785a67a356c87f5ea483a1cbe338191 (diff)
downloadffmpeg-9e37cc11012f23e39b63032b5daac03621340a4f.tar.gz
avcodec/dca: move bits per sample array to dca.c
It will be used by the parser. This change avoids unwanted parser dependency on dcadata. Signed-off-by: James Almer <jamrial@gmail.com>
-rw-r--r--libavcodec/dca.c4
-rw-r--r--libavcodec/dca.h2
-rw-r--r--libavcodec/dcadata.c4
-rw-r--r--libavcodec/dcadata.h2
4 files changed, 6 insertions, 6 deletions
diff --git a/libavcodec/dca.c b/libavcodec/dca.c
index 58f340e6da..fb796191d6 100644
--- a/libavcodec/dca.c
+++ b/libavcodec/dca.c
@@ -45,6 +45,10 @@ const uint8_t ff_dca_freq_ranges[16] = {
0, 1, 2, 3, 4, 1, 2, 3, 4, 4, 0, 1, 2, 3, 4, 4
};
+const uint8_t ff_dca_bits_per_sample[8] = {
+ 16, 16, 20, 20, 0, 24, 24, 0
+};
+
int avpriv_dca_convert_bitstream(const uint8_t *src, int src_size, uint8_t *dst,
int max_size)
{
diff --git a/libavcodec/dca.h b/libavcodec/dca.h
index bd96bc9ee3..1d10de4b94 100644
--- a/libavcodec/dca.h
+++ b/libavcodec/dca.h
@@ -156,6 +156,8 @@ extern av_export const uint32_t avpriv_dca_sample_rates[16];
extern const uint32_t ff_dca_sampling_freqs[16];
extern const uint8_t ff_dca_freq_ranges[16];
+extern const uint8_t ff_dca_bits_per_sample[8];
+
/**
* Convert bitstream to one representation based on sync marker
diff --git a/libavcodec/dcadata.c b/libavcodec/dcadata.c
index eaef01875a..1b646a7aa6 100644
--- a/libavcodec/dcadata.c
+++ b/libavcodec/dcadata.c
@@ -42,10 +42,6 @@ const uint8_t ff_dca_channels[16] = {
1, 2, 2, 2, 2, 3, 3, 4, 4, 5, 6, 6, 6, 7, 8, 8
};
-const uint8_t ff_dca_bits_per_sample[8] = {
- 16, 16, 20, 20, 0, 24, 24, 0
-};
-
const uint8_t ff_dca_dmix_primary_nch[8] = {
1, 2, 2, 3, 3, 4, 4, 0
};
diff --git a/libavcodec/dcadata.h b/libavcodec/dcadata.h
index 9dd6eba7f1..5aa85b3414 100644
--- a/libavcodec/dcadata.h
+++ b/libavcodec/dcadata.h
@@ -32,8 +32,6 @@ extern const uint32_t ff_dca_bit_rates[32];
extern const uint8_t ff_dca_channels[16];
-extern const uint8_t ff_dca_bits_per_sample[8];
-
extern const uint8_t ff_dca_dmix_primary_nch[8];
extern const uint8_t ff_dca_quant_index_sel_nbits[DCA_CODE_BOOKS];