backport r23131 by cehoyos Originally committed as revision 23220 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6