Merge pull request #2225 from akallabeth/openh264_fix
authorMarc-André Moreau <marcandre.moreau@gmail.com>
Fri, 28 Nov 2014 16:23:11 +0000 (11:23 -0500)
committerMarc-André Moreau <marcandre.moreau@gmail.com>
Fri, 28 Nov 2014 16:23:11 +0000 (11:23 -0500)
Openh264 v1.2 API


Trivial merge