Merge commit 'e6d8acf6a8fba4743eb56eabe72a741d1bbee3cb'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 5 Jul 2013 09:41:30 +0000 (11:41 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 5 Jul 2013 09:41:30 +0000 (11:41 +0200)
commitcced6f4d58168096f13a4d34555754717979429d
treec2febbecb61ae395f7281e7131735c1effc1c4ff
parent0f85c96091e9e2c1ab0b939cd966c7c7220dadb0
parente6d8acf6a8fba4743eb56eabe72a741d1bbee3cb
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@gmx.at>
libavcodec/aic.c
libavcodec/cabac_functions.h
libavcodec/ivi_common.c
libavcodec/x86/cabac.h