diff options
| author | Justin Ruggles <justin.ruggles@gmail.com> | 2009-03-22 21:13:10 +0000 |
|---|---|---|
| committer | Justin Ruggles <justin.ruggles@gmail.com> | 2009-03-22 21:13:10 +0000 |
| commit | 492cc392fa518aa211fdee5eadb1f5439f45b47d (patch) | |
| tree | 607a1695d2e7fd5dd1bebb3203dbfd26d4a845b2 /libavcodec/flacdec.c | |
| parent | 7660dc6f4f53dfff96f7702a41e4150f472bdc6a (diff) | |
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
Diffstat (limited to 'libavcodec/flacdec.c')
| -rw-r--r-- | libavcodec/flacdec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/flacdec.c b/libavcodec/flacdec.c index eea2b0e094..80701f188b 100644 --- a/libavcodec/flacdec.c +++ b/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) { |