Michael Niedermayer 0fecf2642b Merge remote-tracking branch 'newdev/master' ...

Conflicts:
	Changelog
	doc/APIchanges
	doc/optimization.txt
	libavformat/avio.h

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

2011-03-17 17:22:52 +01:00

4.6 KiB

Raw Blame History

View Raw