projects
/
platform
/
upstream
/
libav.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
7660dc6
)
10l: don't check against current layout until after validating ch_mode.
author
Justin Ruggles
<justin.ruggles@gmail.com>
Sun, 22 Mar 2009 21:13:10 +0000
(21:13 +0000)
committer
Justin Ruggles
<justin.ruggles@gmail.com>
Sun, 22 Mar 2009 21:13:10 +0000
(21:13 +0000)
should have been in last commit.
Originally committed as revision 18154 to svn://svn.ffmpeg.org/ffmpeg/trunk
libavcodec/flacdec.c
patch
|
blob
|
history
diff --git
a/libavcodec/flacdec.c
b/libavcodec/flacdec.c
index
eea2b0e
..
80701f1
100644
(file)
--- 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) {