Tidying up a few things, added return process from process builder for ffmpeg
Fixed merge conflict