Merge pull request #3947 from akallabeth/openh264_fixes
authorDavid Fort <rdp.effort@gmail.com>
Wed, 10 May 2017 19:22:18 +0000 (21:22 +0200)
committerGitHub <noreply@github.com>
Wed, 10 May 2017 19:22:18 +0000 (21:22 +0200)
Openh264 fixes


Trivial merge