[FFmpeg-cvslog] r18154 - trunk/libavcodec/flacdec.c

[jbr]

Author: jbr
Date: Sun Mar 22 22:13:10 2009
New Revision: 18154

Log:
10l: don't check against current layout until after validating ch_mode. 
should have been in last commit.

Modified:
   trunk/libavcodec/flacdec.c

Modified: trunk/libavcodec/flacdec.c
==============================================================================
--- trunk/libavcodec/flacdec.c	Sun Mar 22 22:07:43 2009	(r18153)
+++ trunk/libavcodec/flacdec.c	Sun Mar 22 22:13:10 2009	(r18154)
@@ -495,7 +495,7 @@ static int decode_frame(FLACContext *s)
 
     /* channels and decorrelation */
     ch_mode = get_bits(gb, 4);
-    if (ch_mode < FLAC_MAX_CHANNELS && s->channels == ch_mode+1) {
+    if (ch_mode < FLAC_MAX_CHANNELS) {
         channels = ch_mode + 1;
         ch_mode = FLAC_CHMODE_INDEPENDENT;
     } else if (ch_mode <= FLAC_CHMODE_MID_SIDE) {