Merge pull request #4735 from antonlacon/ffmpeg-next
authorTed Hess <thess@kitschensync.net>
Sun, 20 Aug 2017 11:38:02 +0000 (07:38 -0400)
committerGitHub <noreply@github.com>
Sun, 20 Aug 2017 11:38:02 +0000 (07:38 -0400)
ffmpeg: fixup mpeg support in libffmpeg-mini


Trivial merge