Patch by Janne Grunau, janne-ffmpeg jannau net backport r23334,23337-23338 by cehoyos and stefano Originally committed as revision 23379 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6