projects / ffmpeg.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from: cced6f4)
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)
* 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>

No differences found
FFmpeg git repo