[FFmpeg-cvslog] Merge remote-tracking branch 'qatar/master'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Oct 13 10:36:59 2013 +0200| [43dec5ef9a360c9ffac3278f464832bd99af0cb0] | committer: Michael Niedermayer

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  indeo4: Check the inherited quant_mat

Conflicts:
	libavcodec/indeo4.c

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

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