Closes issue 290
Patch by Alexander Strange: astrange ithinksw com

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