[obs-studio/f25] (2 commits) ...Merge branch 'master' into f25
Summary of changes:
1bf354c... Actually define FFMPEG_MUX_FIXED (fixes 'command not found' (*)
4842429... Merge branch 'master' into f25
(*) This commit already existed in another branch; no separate mail sent