Hopefully this will be enough.  Fixes issue 1565 (again).

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