]> git.sesse.net Git - vlc/commitdiff
aout: fix non-optimized aout_ChannelReorder() variant
authorRémi Denis-Courmont <remi@remlab.net>
Fri, 12 Apr 2013 17:09:36 +0000 (20:09 +0300)
committerRémi Denis-Courmont <remi@remlab.net>
Fri, 12 Apr 2013 17:09:36 +0000 (20:09 +0300)
src/audio_output/common.c

index 2bc5437289b50e09d1790e95cd46ce986e5fdf57..c725ca59082e3e37efbfe5ee67c6f3c45b664a53 100644 (file)
@@ -322,13 +322,13 @@ do { \
         default:
         {
             unsigned size = aout_BitsPerSample( fourcc ) / 8;
-            const size_t frames = bytes / size;
+            const size_t frames = bytes / (size * channels);
             unsigned char *buf = ptr;
 
             assert( bytes != 0 );
             for( size_t i = 0; i < frames; i++ )
             {
-                unsigned char tmp[AOUT_CHAN_MAX * bytes];
+                unsigned char tmp[AOUT_CHAN_MAX * size];
 
                 for( size_t j = 0; j < channels; j++ )
                     memcpy( tmp + size * chans_table[j], buf + size * j, size );