* modules/codec/faad.c: backport [25080] channel order fix for multichannel AAC

NEWS

@@ -22,6 +22,7 @@ Audio filter:
 
 Audio output:
  * Fixed 5.1 audio on ALSA
+ * Fixed channel order for multichannel AAC
 
 Access:
  * Fixed some RTSP hanging and user/password passing through RTSP URLs

THANKS

@@ -17,6 +17,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
+André Weber <WeberAndre at gmx d0t de> - AAC ordering)
 Andres Krapf <dae at via.ecp.fr> - FreeBSD port and tests, KDE interface
 Andrey Brilevskiy <director at macwest.ru> - Russian translation
 Andrea Guzzo <xant at xant dot net> - Digital cameras support (dc1394)
@@ -145,8 +146,8 @@ Remco Poortinga <poortinga at telin.nl> - IPv6 multicast patch
 Rene Gollent <rgollent at u.arizona.edu> - BeOS interface fix
 Roine Gustafsson <roine at popstar.com> - spudec bug fixes
 Rudolf Cornelissen <rag.cornelissen at inter.nl.net> - BeOS fixes
-Scott Caudle <dorkmanzcot at gmail dot com> - Visualization, WX 
-improvements
+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
 Simon Damkjær Andersen <simondamkjaer at gmail.com> - playmode icons and the entire Fullscreen Panel design for the OS GUI (v0.8.6)
 Steve Lhomme <steve dot lhomme at free dot fr> - MSVC fixes and Matroska enhancements

modules/codec/faad.c

@@ -418,9 +418,9 @@ static void DoReordering( decoder_t *p_dec,
     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] )
             {