Patch by Jai Menon ( jmenon86 gmail com )

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