based on patch by Víctor Paesa <wzrlpy@arsystel.com>

Originally committed as revision 5944 to svn://svn.ffmpeg.org/ffmpeg/trunk