changeset 9236:7ec90057127a libavcodec

10l: don't check against current layout until after validating ch_mode. should have been in last commit.
author jbr
date Sun, 22 Mar 2009 21:13:10 +0000
parents df759d70d6f9
children 69779b592b9d
files flacdec.c
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/flacdec.c	Sun Mar 22 21:07:43 2009 +0000
+++ b/flacdec.c	Sun Mar 22 21:13:10 2009 +0000
@@ -495,7 +495,7 @@
 
     /* 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) {