Merge commit '2ffb0598dbdb81c40650952aa9299fa02fa5e834'

* commit '2ffb0598dbdb81c40650952aa9299fa02fa5e834': mlpdec: check for negative index Conflicts: libavcodec/mlpdec.c See: 8491ac3ad2 Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago · 9b424accbe
parent e266e186cf 2ffb0598db
commit 9b424accbe
1 changed files with 1 additions and 1 deletions
--- 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);