backport r23248 by conrad Originally committed as revision 23320 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6