remove macro definition to the header file
Merge pull request #1653 from ruil2/framerate

remove macro definition to the header file
maintain codec demo
Merge pull request #1654 from syureyi/newest

maintain codec demo
add release note for preparation of v1.3.0
Merge pull request #1655 from sijchen/docx

add release note for preparation of v1.3.0
Avoid a warning about an unused static variable
Make sure the random test bitrate is high enough

This is the same fix as in 47df41 (for the ForceIntraFrame
test) applied to the ForceIntraFrameWithTemporal test.
Merge pull request #1656 from mstorsjo/avoid-warning-unused

Avoid a warning about an unused static variable
Merge pull request #1657 from mstorsjo/clip-bitrate

Make sure the random test bitrate is high enough
    using function pointer to make different branch for different rc
update the version header file for 1.3
Merge pull request #1661 from sijchen/docx

update the version header file to 1.3
Merge pull request #1660 from ruil2/frame_rate

    using function pointer to make different branch for different rc
Update version in Makefile.
Merge pull request #1662 from zaheerm/makefileversion

Update version in Makefile.
Merge remote-tracking branch 'upstream/master' into travis.android