Merge branch 'master' of https://github.com/cisco/openh264
Merge branch 'master' of https://github.com/sijchen/openh264