Originally committed as revision 12658 to svn://svn.ffmpeg.org/ffmpeg/trunk
Originally committed as revision 12657 to svn://svn.ffmpeg.org/ffmpeg/trunk
Patch by Jai Menon (realityman <at> gmx.net) Originally committed as revision 12632 to svn://svn.ffmpeg.org/ffmpeg/trunk