[libopenshot/el7] (3 commits) ...Merge branch 'master' into el7
Summary of changes:
2d49ca1... Rebuild for new ffmpeg version (*)
7ed0931... Update to git HEAD for new OpenShot build (*)
1054a29... Merge branch 'master' into el7
(*) This commit already existed in another branch; no separate mail sent