git.videolan.org
/
ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
dd40902
)
mlpdec: matrix_out_ch must not be greater than max_matrix_channel, and not max_channel.
author
Ramiro Polla
<ramiro.polla@gmail.com>
Sun, 5 Apr 2009 20:11:40 +0000
(20:11 +0000)
committer
Ramiro Polla
<ramiro.polla@gmail.com>
Sun, 5 Apr 2009 20:11:40 +0000
(20:11 +0000)
Originally committed as revision 18335 to svn://svn.ffmpeg.org/ffmpeg/trunk
libavcodec/mlpdec.c
patch
|
blob
|
history
diff --git
a/libavcodec/mlpdec.c
b/libavcodec/mlpdec.c
index
6d148b4
..
8ec78b1
100644
(file)
--- a/
libavcodec/mlpdec.c
+++ b/
libavcodec/mlpdec.c
@@
-508,7
+508,7
@@
static int read_matrix_params(MLPDecodeContext *m, SubStream *s, GetBitContext *
frac_bits = get_bits(gbp, 4);
s->lsb_bypass [mat] = get_bits1(gbp);
- if (s->matrix_out_ch[mat] > s->max_channel) {
+ if (s->matrix_out_ch[mat] > s->max_
matrix_
channel) {
av_log(m->avctx, AV_LOG_ERROR,
"Invalid channel %d specified as output from matrix.\n",
s->matrix_out_ch[mat]);