Merge pull request #5955 from antonlacon/ffmpeg
authorTed Hess <thess@kitschensync.net>
Mon, 23 Apr 2018 12:55:27 +0000 (12:55 +0000)
committerGitHub <noreply@github.com>
Mon, 23 Apr 2018 12:55:27 +0000 (12:55 +0000)
ffmpeg: libffmpeg-full to lgpl; include fdk-aac support


Trivial merge