Patch by S.N. Hemanth Meenakshisundaram -af smeenaks,ucsd,edu.

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