patch by Sam Hocevar < sam -- at -- zoy -- dot  -- org >

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