summaryrefslogtreecommitdiff
path: root/libavcodec/aic.c
Commit message (Collapse)AuthorAge
* Merge commit 'e6d8acf6a8fba4743eb56eabe72a741d1bbee3cb'Michael Niedermayer2013-07-05
|\ | | | | | | | | | | | | | | | | | | | | | | * 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>
| * aic: use chroma scan tables while decoding luma component in progressive modeKostya Shishkov2013-07-04
| | | | | | | | | | | | For some unclear reason Apple decided to use the same scan tables for luma and chroma in the progressive mode while using different ones for luma in the interlaced mode.
* | avcodec/aic: Fix vlc value checksMichael Niedermayer2013-05-22
| | | | | | | | | | | | | | Fixes out of array accesses Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '1232a1647ab27e024a3baf4d01d40c8d08d6ced9'Michael Niedermayer2013-05-17
|/ | | | | | | | | | | | | | | * commit '1232a1647ab27e024a3baf4d01d40c8d08d6ced9': Apple Intermediate Codec decoder movenc: Don't add base_data_offset in tfhd for PIFF files Conflicts: Changelog libavcodec/allcodecs.c libavcodec/avcodec.h libavcodec/codec_desc.c libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
* Apple Intermediate Codec decoderKostya Shishkov2013-05-17