Merge "Code refactoring on Macros related to ref frame numbers" into nextgenv2

diff --cc vp10/common/onyxc_int.h
Simple merge

diff --cc vp10/encoder/bitstream.c
Simple merge

diff --cc vp10/encoder/encoder.c
Simple merge

diff --cc vp10/encoder/encoder.h
Simple merge

diff --cc vp10/encoder/rdopt.c
Simple merge