Mercurial > libavcodec.hg

changeset 10377:98816e4d5522 libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
author conrad
date Thu, 08 Oct 2009 14:40:14 +0000
parents 5c5b864d66e1
children 03b0316b9ead
files aac.c dca.c
diffstat 2 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/aac.c	Wed Oct 07 21:35:24 2009 +0000
+++ b/aac.c	Thu Oct 08 14:40:14 2009 +0000
@@ -527,7 +527,7 @@
     // 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;
--- a/dca.c	Wed Oct 07 21:35:24 2009 +0000
+++ b/dca.c	Thu Oct 08 14:40:14 2009 +0000
@@ -1324,7 +1324,7 @@
         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 {