patch by Samuel Hocevar, sam ..at.. zoy ..dot.. org

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