summaryrefslogtreecommitdiff
path: root/libavcodec/dca.c
diff options
context:
space:
mode:
authorMans Rullgard <mans@mansr.com>2011-09-29 22:03:40 +0100
committerMichael Niedermayer <michaelni@gmx.at>2011-10-22 20:28:45 +0200
commitd4999e0a798cc82db212be67d9edb22f0a7e5847 (patch)
treea13e91f4f2e63b432ade824622aa8ddf6dac251b /libavcodec/dca.c
parentab2539708a241ddb2190d95d68a86b71b0bec601 (diff)
dca: ARMv6 optimised decode_blockcode()
Signed-off-by: Mans Rullgard <mans@mansr.com> (cherry picked from commit 08e3dea3f7f69309574dafc0af6671615e909720) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/dca.c')
-rw-r--r--libavcodec/dca.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/dca.c b/libavcodec/dca.c
index d900d883bd..cdd91612f1 100644
--- a/libavcodec/dca.c
+++ b/libavcodec/dca.c
@@ -1038,6 +1038,7 @@ static void dca_downmix(float *samples, int srcfmt,
}
+#ifndef decode_blockcode
/* Very compact version of the block code decoder that does not use table
* look-up but is slightly slower */
static int decode_blockcode(int code, int levels, int *values)
@@ -1058,6 +1059,7 @@ static int decode_blockcode(int code, int levels, int *values)
return -1;
}
}
+#endif
static const uint8_t abits_sizes[7] = { 7, 10, 12, 13, 15, 17, 19 };
static const uint8_t abits_levels[7] = { 3, 5, 7, 9, 13, 17, 25 };