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)
gerbera: add support for ffmpeg


Trivial merge