Patch by Jindrich Makovicka, approved by mans.

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