Patch by Stefano Sabatini and Michael Niedermayer

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