* commit '35c6ce76b107225a19eb33aea38857d2405882af': Canopus HQX decoder Conflicts: Changelog libavcodec/avcodec.h libavcodec/version.h tests/fate/video.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>
Based on work by Kostya Shishkov <kostya.shishkov@gmail.com>.