Aside from being the correct thing to do, this also
fixes issue 1299.

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