diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-07-05 11:41:30 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-07-05 11:41:30 +0200 |
| commit | cced6f4d58168096f13a4d34555754717979429d (patch) | |
| tree | c2febbecb61ae395f7281e7131735c1effc1c4ff /libavcodec/pnm.h | |
| parent | 0f85c96091e9e2c1ab0b939cd966c7c7220dadb0 (diff) | |
| parent | e6d8acf6a8fba4743eb56eabe72a741d1bbee3cb (diff) | |
| download | ffmpeg-cced6f4d58168096f13a4d34555754717979429d.tar.gz | |
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>
Diffstat (limited to 'libavcodec/pnm.h')
0 files changed, 0 insertions, 0 deletions