backport r23165 by mstorsjo Originally committed as revision 23238 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6
backport r23164 by mstorsjo Originally committed as revision 23237 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6