generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
should have been in last commit.

Originally committed as revision 18154 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Justin Ruggles 2009-03-22 21:13:10 +00:00
parent 7660dc6f4f
commit 492cc392fa
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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