* commit '22526c1f557a72b3285d295bd8b30c40eb65d437': Canopus HQ/HQA decoder Conflicts: Changelog libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
Based on work by Kostya Shishkov <kostya.shishkov@gmail.com>. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>