[vlc-commits] faad: Fix channel reordering loop.

[Hugo Beauzée-Luyssen]

vlc/vlc-2.0 | branch: master | Hugo Beauzée-Luyssen <beauze.h at gmail.com> | Wed May  2 15:37:31 2012 +0200| [a6dd86b1d8ac1d883b3671b061329a43ea58f180] | committer: Jean-Baptiste Kempf

faad: Fix channel reordering loop.
(cherry picked from commit e6050c742c28f3ba714cbadda19e11dab1cdd625)

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=a6dd86b1d8ac1d883b3671b061329a43ea58f180
---

 modules/codec/faad.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/modules/codec/faad.c b/modules/codec/faad.c
index a9218f9..38e50a3 100644
--- a/modules/codec/faad.c
+++ b/modules/codec/faad.c
@@ -437,7 +437,8 @@ static aout_buffer_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block )
 
         /* Convert frame.channel_position to our own channel values */
         p_dec->fmt_out.audio.i_physical_channels = 0;
-        for( i = 0; i < frame.channels; i++ )
+        const uint32_t nbChannels = frame.channels;
+        for( i = 0; i < nbChannels; i++ )
         {
             /* Find the channel code */
             for( j = 0; j < MAX_CHANNEL_POSITIONS; j++ )