10l: don't check against current layout until after validating ch_mode.

should have been in last commit.


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@18154 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b

libavcodec/flacdec.c

@@ -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) {