[FFmpeg-cvslog] Merge remote-tracking branch 'newdev/master'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Mar 17 16:53:58 2011 +0100| [0fecf2642b9d909820683647c70031a954f5e58d] | committer: Michael Niedermayer

Merge remote-tracking branch 'newdev/master'

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

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0fecf2642b9d909820683647c70031a954f5e58d
---