fix according to comments
Merge branch 'before_review2' of https://github.com/sijchen/openh264 into working5
fixing