commit 48424296b444fe490d607e47a18749496e0fe087 Merge: b181a34 1bf354c Author: leigh123linux <leigh123linux(a)googlemail.com&gt; Date: Fri Aug 26 14:43:33 2016 +0100 Merge branch 'master' into f25 obs-ffmpeg-mux.patch | 15 +++++++++++++-- obs-studio.spec | 8 +++++--- 2 files changed, 18 insertions(+), 5 deletions(-) ---