fix resolution setting issue
Merge remote-tracking branch 'upstream/master'
remove comments
adjust trace
Merge branch 'master' of https://github.com/cisco/openh264
Merge branch 'master' of https://github.com/cisco/openh264
Merge branch 'master' of https://github.com/cisco/openh264
Merge branch 'master' of https://github.com/cisco/openh264
Merge branch 'master' of https://github.com/cisco/openh264
Merge branch 'master' of https://github.com/cisco/openh264
clean redundant code
Merge branch 'master' of https://github.com/cisco/openh264
Merge branch 'master' of https://github.com/cisco/openh264
Merge branch 'master' of https://github.com/cisco/openh264
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' of https://github.com/cisco/openh264
Merge branch 'master' of https://github.com/ganyangbbl/openh264
Merge branch 'master' of https://github.com/cisco/openh264
Merge branch 'master' of https://github.com/cisco/openh264
Merge branch 'master' of https://github.com/ganyangbbl/openh264