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
..
2007-06-12 09:29:25 +00:00
2011-03-16 22:01:01 +01:00
2011-03-16 22:01:01 +01:00
2011-03-16 22:01:01 +01:00
2011-03-16 22:01:01 +01:00
2011-03-16 22:01:01 +01:00
2011-03-16 22:01:01 +01:00
2011-03-16 22:01:01 +01:00
2011-03-16 22:01:01 +01:00
2011-01-30 03:41:47 +01:00