1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-02-09 14:14:39 +02:00
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
..
aic
amv
ast
bfi
caf
2015-04-19 22:37:23 +01:00
2015-04-19 22:37:23 +01:00
2015-04-19 22:37:23 +01:00
2015-02-22 22:42:27 +00:00
crc
2015-04-02 23:15:57 +02:00
dpx
2015-02-19 12:05:19 -05:00
2015-02-19 12:05:19 -05:00
2015-02-26 14:20:02 +01:00
2015-02-26 14:20:02 +01:00
2015-01-14 20:45:50 +01:00
jv
md5
mtv
opt
2015-03-05 13:50:22 +01:00
ptx
rl2
sha
smc
thp
tmv
2015-03-23 20:53:28 +00:00
2015-03-23 20:53:28 +00:00
url
vb
vp5
vp7
w64
yop