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