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)
commit47d18a0d08649ec0a828b8e76e97e82f4aa85a25
tree6308ff167324e9f2d0504f0d2c726b9cd0157b73
parentcaed4b5132759cbe4f6c9948acbcf37779ad9fea
parenta70227e578e1b78fec03f08dc5413a13caf82ab8
Merge pull request #5955 from antonlacon/ffmpeg

ffmpeg: libffmpeg-full to lgpl; include fdk-aac support