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

git-svn-id: file:///var/local/repositories/ffmpeg/trunk@20598 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b