Patch by David Conrad %lessen42 A gmail P com%

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