FFmpeg/libavformat
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
..
2015-04-07 22:50:07 +02:00
2015-03-27 18:29:46 +01:00
2015-03-06 21:35:00 +01:00
2015-02-26 02:06:10 +01:00
2015-03-26 03:10:27 +01:00
2015-01-30 09:33:49 +00:00
2015-02-15 18:20:54 +01:00
2015-03-21 23:18:14 +01:00
2015-01-18 00:36:56 +01:00
2015-02-01 20:00:10 +01:00
2015-03-27 18:29:46 +01:00
2015-03-27 18:29:46 +01:00
2015-04-11 13:51:03 +02:00