Michael Niedermayer f392949f1a Merge commit 'ae17878fb2ab100264226c84c58f5b95a703312f' ...

* commit 'ae17878fb2ab100264226c84c58f5b95a703312f':
  BRender PIX image decoder

Conflicts:
	doc/general.texi
	libavcodec/Makefile
	libavcodec/version.h

See: 492a5f835c, and others
Merged-by: Michael Niedermayer <michaelni@gmx.at>

2014-03-27 21:09:17 +01:00

3.6 KiB

Raw Blame History

View Raw