2 commits

Author	SHA1	Message	Date
Michael Niedermayer	5a284d076f	Merge commit '22526c1f55' ... * commit '22526c1f55': Canopus HQ/HQA decoder Conflicts: Changelog libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>	2015-04-20 05:28:13 +02:00
Vittorio Giovara	22526c1f55	Canopus HQ/HQA decoder ... Based on work by Kostya Shishkov <kostya.shishkov@gmail.com>. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>	2015-04-19 22:37:23 +01:00