diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-11-13 13:59:22 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-11-13 13:59:53 +0100 |
| commit | 9b424accbe103c304099325c133c4ce1ed9dfe85 (patch) | |
| tree | 762c01128514cdc14c7a6c5cf1bb4902f7e97a2b /libavcodec/mlpdec.c | |
| parent | e266e186cf1293b755dbc816fac333f300f7c95f (diff) | |
| parent | 2ffb0598dbdb81c40650952aa9299fa02fa5e834 (diff) | |
| download | ffmpeg-9b424accbe103c304099325c133c4ce1ed9dfe85.tar.gz | |
Merge commit '2ffb0598dbdb81c40650952aa9299fa02fa5e834'
* commit '2ffb0598dbdb81c40650952aa9299fa02fa5e834':
mlpdec: check for negative index
Conflicts:
libavcodec/mlpdec.c
See: 8491ac3ad2e9fc92479d6fc42d6ee4cb8d6f61d3
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mlpdec.c')
| -rw-r--r-- | libavcodec/mlpdec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/mlpdec.c b/libavcodec/mlpdec.c index d26c27777e..490d107e78 100644 --- a/libavcodec/mlpdec.c +++ b/libavcodec/mlpdec.c @@ -583,7 +583,7 @@ FF_ENABLE_DEPRECATION_WARNINGS ch_assign = av_get_channel_layout_channel_index(s->ch_layout, channel); } - if ((unsigned)ch_assign > s->max_matrix_channel) { + if (ch_assign < 0 || ch_assign > s->max_matrix_channel) { avpriv_request_sample(m->avctx, "Assignment of matrix channel %d to invalid output channel %d", ch, ch_assign); |