Merge branch 'master' of https://github.com/louisabraham/ffpass
authorlouisabraham <louis.abraham@yahoo.fr>
Tue, 2 Apr 2019 22:58:58 +0000 (00:58 +0200)
committerlouisabraham <louis.abraham@yahoo.fr>
Tue, 2 Apr 2019 22:58:58 +0000 (00:58 +0200)

Trivial merge