2 Commits

Author	SHA1	Message	Date
Michael Niedermayer	0c4bf87b29	Merge remote-tracking branch 'qatar/master' ... * qatar/master: Mirillis FIC video decoder Conflicts: Changelog configure libavcodec/Makefile libavcodec/avcodec.h libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-02-08 19:02:46 +01:00
Kostya Shishkov	cde7df25ef	Mirillis FIC video decoder ... Does not contain cursor rendering yet. Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>	2014-02-08 15:04:13 +00:00