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)
commitef7fce0a9ec46f89bdcb675d8af92dd0612d6435
tree458c1630e35560d7a4cb6a922eb2214b43e5d901
parentbe40688f97fa7f94055fadf6518f347b91f30d44
parentaa7f67fd844a4c442f7851543e6f8b4e0dfaa360
Merge branch 'master' of https://github.com/louisabraham/ffpass