Patch by Justin Ruggles (justin ruggles gmail com)

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