Patch by Diego 'Flameeyes' Pettenò (flameeyes AT gmail DOT com)

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