Browse Source

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

should have been in last commit.

Originally committed as revision 18154 to svn://svn.ffmpeg.org/ffmpeg/trunk
tags/v0.6
Justin Ruggles 16 years ago
parent
commit
492cc392fa
1 changed files with 1 additions and 1 deletions
  1. +1
    -1
      libavcodec/flacdec.c

+ 1
- 1
libavcodec/flacdec.c View File

@@ -495,7 +495,7 @@ static int decode_frame(FLACContext *s)


/* channels and decorrelation */ /* channels and decorrelation */
ch_mode = get_bits(gb, 4); 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; channels = ch_mode + 1;
ch_mode = FLAC_CHMODE_INDEPENDENT; ch_mode = FLAC_CHMODE_INDEPENDENT;
} else if (ch_mode <= FLAC_CHMODE_MID_SIDE) { } else if (ch_mode <= FLAC_CHMODE_MID_SIDE) {


Loading…
Cancel
Save