Reverted unrelated file change
Formatting
Made some code general to use also in FFmpegWebVideo