Originally committed as revision 18348 to svn://svn.ffmpeg.org/ffmpeg/trunk
patch by Martin Storsjö (martin AT martin DOT st) Originally committed as revision 18347 to svn://svn.ffmpeg.org/ffmpeg/trunk