summaryrefslogtreecommitdiff
path: root/libavcodec/hqxvlc.c
Commit message (Collapse)AuthorAge
* Merge commit '7c60c124c8dfaebfafa2b3c11b316db549617732'Michael Niedermayer2015-03-17
|\ | | | | | | | | | | | | * commit '7c60c124c8dfaebfafa2b3c11b316db549617732': hqx: Drop unused offsets table Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * hqx: Drop unused offsets tableVittorio Giovara2015-03-17
| | | | | | | | This is a leftover from the static to dynamic vlc table conversion.
* | Merge commit '35c6ce76b107225a19eb33aea38857d2405882af'Michael Niedermayer2015-02-23
|/ | | | | | | | | | | | | * commit '35c6ce76b107225a19eb33aea38857d2405882af': Canopus HQX decoder Conflicts: Changelog libavcodec/avcodec.h libavcodec/version.h tests/fate/video.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>
* Canopus HQX decoderVittorio Giovara2015-02-22
Based on work by Kostya Shishkov <kostya.shishkov@gmail.com>.