Merge pull request #3436 from akallabeth/openh264_1_6_support
authorBernhard Miklautz <bmiklautz@users.noreply.github.com>
Thu, 7 Jul 2016 12:41:34 +0000 (12:41 +0000)
committerGitHub <noreply@github.com>
Thu, 7 Jul 2016 12:41:34 +0000 (12:41 +0000)
Added support for OpenH264 1.6


Trivial merge