Merge branch 'ffmpeg-4.0', thanks to @jcowgill (closes: #173)
authorPaul Brossier <piem@piem.org>
Mon, 23 Apr 2018 23:04:36 +0000 (01:04 +0200)
committerPaul Brossier <piem@piem.org>
Mon, 23 Apr 2018 23:04:36 +0000 (01:04 +0200)

Trivial merge