:Merge branch 'master' of https://github.com/cisco/openh264 into encoder_bitrate
iMerge branch 'encoder_bitrate' of https://github.com/ruil2/openh264 into encoder_bitrate