Michael Niedermayer 2cf521718d Merge commit '35c6ce76b107225a19eb33aea38857d2405882af'
* commit '35c6ce76b107225a19eb33aea38857d2405882af':
  Canopus HQX decoder

Conflicts:
	Changelog
	libavcodec/avcodec.h
	libavcodec/version.h
	tests/fate/video.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-23 12:19:26 +01:00
..
aic
amv
ast
bfi
caf
2015-02-22 22:42:27 +00:00
2015-02-22 22:42:27 +00:00
crc
dpx
2015-02-19 12:05:19 -05:00
2015-02-19 12:05:19 -05:00
2015-01-14 20:45:50 +01:00
jv
md5
mkv
mtv
opt
ptx
rl2
sha
smc
thp
tmv
url
vb
vp5
vp7
w64
yop