patch by Mathieu Malaterre, mathieu.malaterre gmail com Originally committed as revision 17129 to svn://svn.ffmpeg.org/ffmpeg/trunk
Patch by Jaikrishnan Menon Originally committed as revision 17017 to svn://svn.ffmpeg.org/ffmpeg/trunk