based on patch by Matthieu Castet, castet ! matthieu $ free ! fr

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