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 \
Update version in Makefile.
Merge pull request #1662 from zaheerm/makefileversion

Update version in Makefile.
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
fix a spatial layer index error
Merge pull request #1667 from lyao2/ut_fix3

fix a spatial layer index error
    refine frame rate
Remove a write-only variable

This fixes warnings with GCC about a variable that is set but
not used.
Use an unsigned variable for comparison with unsigned values

This avoids warnings about comparison between signed and unsigned.
Initialize a local variable

This fixes warnings with GCC about a variable that may be used
uninitialized (if iResProperty was an incorrect value).
Merge pull request #1668 from mstorsjo/fix-warnings

Fix build warnings with GCC
add RC_TIMESTAMP_MODE mode
Merge pull request #1669 from ruil2/rc

add RC_TIMESTAMP_MODE mode
Merge pull request #1665 from ruil2/frame_rate

refine frame rate