* qatar/master:
  indeo4: Check the inherited quant_mat

Conflicts:
	libavcodec/indeo4.c

See: 884efd4eMerged-by: Michael Niedermayer <michaelni@gmx.at>