[flowblade/f23] (2 commits) ...Merge branch 'master' into f23
Summary of changes:
7ded90a... Readd ffmpeg Add Requires mlt-freeworld in a if clause (*)
33d2650... Merge branch 'master' into f23
(*) This commit already existed in another branch; no separate mail sent