Merge pull request #12946 from neheb/gerbbb
authorRosen Penev <rosenp@gmail.com>
Mon, 27 Jul 2020 06:34:11 +0000 (23:34 -0700)
committerGitHub <noreply@github.com>
Mon, 27 Jul 2020 06:34:11 +0000 (23:34 -0700)
commit47de4d391e43bd1598cb3c3378433ef5151d7c36
tree74d09149ca5441fa6ac69268743caef5424af733
parent8d01a3e1042ff48ce8e3a7fe5af50b6ab2a3889e
parent2e44682349e6fc4293c3d5b527cd748b5baa7683
Merge pull request #12946 from neheb/gerbbb

gerbera: add support for ffmpeg