Michael Niedermayer 5a284d076f Merge commit '22526c1f557a72b3285d295bd8b30c40eb65d437'
* commit '22526c1f557a72b3285d295bd8b30c40eb65d437':
  Canopus HQ/HQA decoder

Conflicts:
	Changelog
	libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-20 05:28:13 +02:00
..
2014-06-05 12:20:44 +02:00
2015-04-13 11:33:02 +02:00
2015-04-12 00:15:58 +02:00
2014-04-19 05:06:06 +02:00
2014-01-15 21:20:47 +01:00
2015-04-10 21:49:37 +02:00
2015-04-02 23:15:57 +02:00
2014-10-22 23:12:38 +02:00
2015-02-11 22:44:06 +01:00
2014-09-02 14:41:13 -07:00