aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorDavid Conrad <lessen42@gmail.com>2009-10-08 14:40:14 +0000
committerDavid Conrad <lessen42@gmail.com>2009-10-08 14:40:14 +0000
commit144fec83b3abd42ac361b3c964467dff5a1ac958 (patch)
tree1693ad16d6a7fc9d6bd4f9cc2a38e5db265407a9 /libavcodec
parent12bf71b691b77c9ce229d5f715c4b954fa2b7aa1 (diff)
downloadffmpeg-144fec83b3abd42ac361b3c964467dff5a1ac958.tar.gz
dca and aac decoders use float_to_int16_interleave, so check for
the C version of that rather than float_to_int16. Fixes output on ARM/VFP Originally committed as revision 20192 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/aac.c2
-rw-r--r--libavcodec/dca.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/aac.c b/libavcodec/aac.c
index 2dc79607e9..68a007bb66 100644
--- a/libavcodec/aac.c
+++ b/libavcodec/aac.c
@@ -527,7 +527,7 @@ static av_cold int aac_decode_init(AVCodecContext *avccontext)
// 32768 - Required to scale values to the correct range for the bias method
// for float to int16 conversion.
- if (ac->dsp.float_to_int16 == ff_float_to_int16_c) {
+ if (ac->dsp.float_to_int16_interleave == ff_float_to_int16_interleave_c) {
ac->add_bias = 385.0f;
ac->sf_scale = 1. / (-1024. * 32768.);
ac->sf_offset = 0;
diff --git a/libavcodec/dca.c b/libavcodec/dca.c
index b68e547050..e411c3695d 100644
--- a/libavcodec/dca.c
+++ b/libavcodec/dca.c
@@ -1324,7 +1324,7 @@ static av_cold int dca_decode_init(AVCodecContext * avctx)
s->samples_chanptr[i] = s->samples + i * 256;
avctx->sample_fmt = SAMPLE_FMT_S16;
- if(s->dsp.float_to_int16 == ff_float_to_int16_c) {
+ if(s->dsp.float_to_int16_interleave == ff_float_to_int16_interleave_c) {
s->add_bias = 385.0f;
s->scale_bias = 1.0 / 32768.0;
} else {