Eliminates need for concatenation and adds proper fix for FIXME

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