Based on a patch by Aviad Rozenhek aviadr1 @ reverse(moc.liamg).

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