[avidemux/f33] (5 commits) ...Merge branch 'master' into f33