fix a typo
Merge pull request #953 from ruil2/codec_fix

fix a typo
Merge remote-tracking branch 'upstream/master' into travis.android