rename some variables
Merge branch 'enc_test' of https://github.com/ruil2/openh264 into enc_test