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

27 KiB

Raw Blame History

View Raw