AAC reordering fix. Patch by Sebastian Jenny and atmo. THANKS them.

Close #493

diff --git a/THANKS b/THANKS
index 91db6df2de31e0d1ff17b3e7ceb0a937795bbcc1..58a2725ed5221ff3ff8d1b086b8e75ee3640b08b 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -19,7 +19,7 @@ Alex Izvorski <aizvorski at gmail dot com> - some more x264 options
 Andrea Guzzo <xant at xant dot net> - dc1394 firewire support
 André de Barros Martins Ribeiro <andrerib at ajato.com.br> - Brazilian portuguese localization
 Andre Pang <adre.pang at csiro dot au> - Annodex support
-Andre Weber <WeberAndre at gmx d0t de> - Qt4 patches
+Andre Weber <WeberAndre at gmx d0t de> - Qt4 patches, AAC ordering pathes
 Andres Krapf <dae at via.ecp.fr> - FreeBSD port and tests, KDE interface
 Andrew Zaikin <andrew dot zaikin at gmail dot com> - Config saving fixes
 Andrey Brilevskiy <director at macwest.ru> - Russian translation
@@ -194,6 +194,7 @@ Roman Bednarek <roman at mikronika.com.pl> - MPL2 subtitles support
 Rudolf Cornelissen <rag.cornelissen at inter.nl.net> - BeOS fixes
 Sašo Kiselkov <skiselkov _at_ gmail dot com> - RTSP session timeout fix for some STBs, multipass x264 patch
 Scott Caudle <dorkmanzcot at gmail dot com> - Visualization, WX improvements
+Sebastian Jenny <jenny - sebastian &t gmail - com > - AAC decoding channel ordering fix.
 Sebastien Chaumat <Sebastien.Chaumat at ens-lyon.fr> - YOPY port tests
 Sidney Doria <ssdoria qt gmail.com> - Brazilian Portuguese localisation
 Simon Damkjær Andersen <simondamkjaer at gmail.com> - playmode icons and the entire Fullscreen Panel design for the OSX GUI (v0.8.6)

diff --git a/modules/codec/faad.c b/modules/codec/faad.c
index 632cd12c81fd3cac7ee6f7f5169a0079bd7c9dcf..b9c7dfd33b35298b2049736983c36452fdc2bd8d 100644 (file)
--- a/modules/codec/faad.c
+++ b/modules/codec/faad.c
@@ -447,9 +447,9 @@ static void DoReordering( uint32_t *p_out, uint32_t *p_in, int i_samples,
     int i, j, k;
 
     /* Find the channels mapping */
-    for( k = 0, j = 0; k < i_nb_channels; k++ )
+    for( i = 0, j = 0; i < MAX_CHANNEL_POSITIONS; i++ )
     {
-        for( i = 0; i < MAX_CHANNEL_POSITIONS; i++ )
+        for( k = 0; k < i_nb_channels; k++ )
         {
             if( pi_channels_ordered[i] == pi_chan_positions[k] )
             {