[FFmpeg-cvslog] Merge commit 'e6d8acf6a8fba4743eb56eabe72a741d1bbee3cb'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Jul  5 11:41:30 2013 +0200| [cced6f4d58168096f13a4d34555754717979429d] | committer: Michael Niedermayer

Merge commit 'e6d8acf6a8fba4743eb56eabe72a741d1bbee3cb'

* commit 'e6d8acf6a8fba4743eb56eabe72a741d1bbee3cb':
  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 at gmx.at>

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