Patch by kweiner spamcop net
closes Issue318

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