use the same complexity computation branch for screen and camera
Merge pull request #1657 from mstorsjo/clip-bitrate

Make sure the random test bitrate is high enough
support scaling list

astyle

change bugs

fix security issue

fix the issue pps sps order

change according to wayne's suggestion

change according to wayne's
Delete \
Use the correct types instead of void pointers in function signatures in rc.h
Merge pull request #1664 from mstorsjo/type-signatures

Use the correct types instead of void pointers in function signatures in rc.h
Merge pull request #1659 from syureyi/scalinglist

Scalinglist
Merge pull request #1632 from ruil2/encoder_refine

use the same complexity computation branch for screen and camera
Merge remote-tracking branch 'upstream/master' into travis.osx