summaryrefslogtreecommitdiffstats
path: root/libfaad2/output.c
diff options
context:
space:
mode:
authorrtognimp <rtognimp@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-04-18 19:39:34 +0000
committerrtognimp <rtognimp@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-04-18 19:39:34 +0000
commit82361d50d0dcbb72132fe1203fe152a89dd165e9 (patch)
tree4abb0b4820172c1167ddb75433038be03aa44063 /libfaad2/output.c
parentb664e7f3216a22b9e3f92e4861733a3222fa11d8 (diff)
downloadmpv-82361d50d0dcbb72132fe1203fe152a89dd165e9.tar.bz2
mpv-82361d50d0dcbb72132fe1203fe152a89dd165e9.tar.xz
Update to faad2 cvs 20040915+MPlayer fixes
Patch by me and Emanuele Giaquinta git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18142 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libfaad2/output.c')
-rw-r--r--libfaad2/output.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libfaad2/output.c b/libfaad2/output.c
index 792909c146..49f4e90c8f 100644
--- a/libfaad2/output.c
+++ b/libfaad2/output.c
@@ -589,7 +589,7 @@ void* output_to_PCM(NeAACDecHandle hDecoder,
{
for (ch = 0; ch < channels; ch++)
{
- int32_t tmp = input[ch][i];
+ int32_t tmp = input[hDecoder->internal_channel[ch]][i];
tmp += (1 << (REAL_BITS-1));
tmp >>= REAL_BITS;
if ((tmp+0x8000) & ~0xffff) tmp = ~(tmp>>31)-0x8000;