Use output parameter instead of fpv
Don't test for swf output anymore