Commit 337af60f authored by Dennis van Amerongen's avatar Dennis van Amerongen

* modules/codec/faad.c: revert [25155] channel order fix since it needs more...

* modules/codec/faad.c: revert [25155] channel order fix since it needs more than also backporting [23226] simple.c so revert for now until we have something that applies to bugfix
parent d01f8f4d
...@@ -20,7 +20,6 @@ Audio filter: ...@@ -20,7 +20,6 @@ Audio filter:
Audio output: Audio output:
* Fixed 5.1 audio on ALSA * Fixed 5.1 audio on ALSA
* Fixed channel order for multichannel AAC
Access: Access:
* Fixed some RTSP hanging and user/password passing through RTSP URLs * Fixed some RTSP hanging and user/password passing through RTSP URLs
......
...@@ -17,7 +17,6 @@ Alex Izvorski <aizvorski at gmail dot com> - some more x264 options ...@@ -17,7 +17,6 @@ Alex Izvorski <aizvorski at gmail dot com> - some more x264 options
Andrea Guzzo <xant at xant dot net> - dc1394 firewire support Andrea Guzzo <xant at xant dot net> - dc1394 firewire support
André de Barros Martins Ribeiro <andrerib at ajato.com.br> - Brazilian portuguese localization André de Barros Martins Ribeiro <andrerib at ajato.com.br> - Brazilian portuguese localization
Andre Pang <adre.pang at csiro dot au> - Annodex support 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 Andres Krapf <dae at via.ecp.fr> - FreeBSD port and tests, KDE interface
Andrey Brilevskiy <director at macwest.ru> - Russian translation Andrey Brilevskiy <director at macwest.ru> - Russian translation
Andrea Guzzo <xant at xant dot net> - Digital cameras support (dc1394) Andrea Guzzo <xant at xant dot net> - Digital cameras support (dc1394)
...@@ -147,7 +146,6 @@ Rene Gollent <rgollent at u.arizona.edu> - BeOS interface fix ...@@ -147,7 +146,6 @@ Rene Gollent <rgollent at u.arizona.edu> - BeOS interface fix
Roine Gustafsson <roine at popstar.com> - spudec bug fixes Roine Gustafsson <roine at popstar.com> - spudec bug fixes
Rudolf Cornelissen <rag.cornelissen at inter.nl.net> - BeOS 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 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) 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 Steve Lhomme <steve dot lhomme at free dot fr> - MSVC fixes and Matroska enhancements
......
...@@ -418,9 +418,9 @@ static void DoReordering( decoder_t *p_dec, ...@@ -418,9 +418,9 @@ static void DoReordering( decoder_t *p_dec,
int i, j, k; int i, j, k;
/* Find the channels mapping */ /* Find the channels mapping */
for( i = 0, j = 0; i < MAX_CHANNEL_POSITIONS; i++ ) for( k = 0, j = 0; k < i_nb_channels; k++ )
{ {
for( k = 0; k < i_nb_channels; k++ ) for( i = 0; i < MAX_CHANNEL_POSITIONS; i++ )
{ {
if( pi_channels_ordered[i] == pi_chan_positions[k] ) if( pi_channels_ordered[i] == pi_chan_positions[k] )
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment