git.sesse.net Git - ffmpeg/commit

]> git.sesse.net Git - ffmpeg/commit

author	Michael Niedermayer <michaelni@gmx.at>
	Mon, 20 Apr 2015 03:28:13 +0000 (05:28 +0200)
committer	Michael Niedermayer <michaelni@gmx.at>
	Mon, 20 Apr 2015 03:28:13 +0000 (05:28 +0200)
commit	5a284d076ffdca705204e3e4100917cd4dbda14c
tree	409db710f32304c4192b2cebf4446bb0242b8189	tree \| snapshot
parent	fcca7671e29b67812d29af710ff90486944ee428	commit \| diff
parent	22526c1f557a72b3285d295bd8b30c40eb65d437	commit \| diff

Merge commit '22526c1f557a72b3285d295bd8b30c40eb65d437'

* commit '22526c1f557a72b3285d295bd8b30c40eb65d437':
Canopus HQ/HQA decoder

Conflicts:
Changelog
libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>

14 files changed:

Unnamed repository; edit this file 'description' to name the repository.