Merge commit '2ffb0598dbdb81c40650952aa9299fa02fa5e834'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 13 Nov 2014 12:59:22 +0000 (13:59 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 13 Nov 2014 12:59:53 +0000 (13:59 +0100)
commit9b424accbe103c304099325c133c4ce1ed9dfe85
tree762c01128514cdc14c7a6c5cf1bb4902f7e97a2b
parente266e186cf1293b755dbc816fac333f300f7c95f
parent2ffb0598dbdb81c40650952aa9299fa02fa5e834
Merge commit '2ffb0598dbdb81c40650952aa9299fa02fa5e834'

* commit '2ffb0598dbdb81c40650952aa9299fa02fa5e834':
  mlpdec: check for negative index

Conflicts:
libavcodec/mlpdec.c

See: 8491ac3ad2e9fc92479d6fc42d6ee4cb8d6f61d3

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/mlpdec.c