mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-02-09 14:14:39 +02:00
* commit '22526c1f557a72b3285d295bd8b30c40eb65d437': Canopus HQ/HQA decoder Conflicts: Changelog libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>