* commit 'e6d8acf6':
  indeo: use a typedef for the mc function pointer
  cabac: x86 version of get_cabac_bypass
  aic: use chroma scan tables while decoding luma component in progressive mode

Conflicts:
	libavcodec/aic.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>