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)
* commit '2ffb0598dbdb81c40650952aa9299fa02fa5e834':
  mlpdec: check for negative index

Conflicts:
libavcodec/mlpdec.c

See: 8491ac3ad2e9fc92479d6fc42d6ee4cb8d6f61d3

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

Simple merge