Patch originally from Justin Ruggles > jruggle ta earthlink tod net <
and reordered by me to be more diff friendly.

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