Commit 492cc392 authored by Justin Ruggles's avatar Justin Ruggles

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
parent 7660dc6f
...@@ -495,7 +495,7 @@ static int decode_frame(FLACContext *s) ...@@ -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) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment