Patch by Nick Brereton <nick at nbrereton dot net> backport r23085 by ramiro Originally committed as revision 23216 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6