[FFmpeg-cvslog] Merge commit '6255ccf7d51c82ab79bf0cd47a921f572dda4489'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Jul 14 12:42:23 2013 +0200| [8c0bb195220d9dc7b46701519cc1a617ddbba0b8] | committer: Michael Niedermayer

Merge commit '6255ccf7d51c82ab79bf0cd47a921f572dda4489'

* commit '6255ccf7d51c82ab79bf0cd47a921f572dda4489':
  indeo4: Check the quantization matrix index

Conflicts:
	libavcodec/indeo4.c

See: 8a20774a24bb1ea68b7360113746eac6e59ad8a8

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

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