[FFmpeg-cvslog] Merge commit '2ffb0598dbdb81c40650952aa9299fa02fa5e834'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Nov 13 13:59:22 2014 +0100| [9b424accbe103c304099325c133c4ce1ed9dfe85] | committer: Michael Niedermayer

Merge commit '2ffb0598dbdb81c40650952aa9299fa02fa5e834'

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

Conflicts:
	libavcodec/mlpdec.c

See: 8491ac3ad2e9fc92479d6fc42d6ee4cb8d6f61d3

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9b424accbe103c304099325c133c4ce1ed9dfe85
---