Fix compiling errors due to git merge
Merge "Fixed a build issue"
Merge "Change back the scaling calculation."
Merge "Always use adaptive motion search in non-RD coding mode"
Merge "Enable recursive partition selection for non-RD coding mode"
Always use adaptive motion search in non-RD coding mode
Merge "Fix uninitialized read in postprocessing"
Merge "Align threading LFWorkerData to 32 bytes."
Merge "Making c++ compiler happier."
Merge "Don't subpartion inactive area in rd_use_partition."
Merge "Deduplicate and rename mode info step."
Merge "Initialization code cleanup."
Merge "General cleanup in vp9_decoder.{h, c}."
Merge "Using local variable for token_cache."
Merge "Adding get_buf_from_mv() function."
Merge "Cleaning up vp9_aq_cyclicrefresh.{c, h}."
Fix uninitialized read in postprocessing
Enable recursive partition selection for non-RD coding mode
Merge "vp9_write_bit_buffer.h header statics converted to globals"
Merge "vp9_variance.h header static version converted to global"
Merge "Adding init_rate_control() function + cleanup."
Deduplicate and rename mode info step.
Don't subpartion inactive area in rd_use_partition.
Align threading LFWorkerData to 32 bytes.
Initialization code cleanup.
Cleaning up vp9_aq_cyclicrefresh.{c, h}.
Merge "refactor reset_skip_txfm_size and elimate a lot of code"
Merge "vp9_onyx_int.h convert header statics to inline"
Merge "Fix to a static warning."
Adding init_rate_control() function + cleanup.
Merge "[svc] Add min/max q and min/max bitrate in svc test app"
Merge "AVX2 SAD Optimization:"
vp9_write_bit_buffer.h header statics converted to globals
vp9_variance.h header static version converted to global
Merge "Removing unused members from VP9D_CONFIG struct."
vp9_onyx_int.h convert header statics to inline
Merge "Cleaning up vp9_loopfilter.c."
refactor reset_skip_txfm_size and elimate a lot of code
Change back the scaling calculation.
vp9_block.h static reconverted to inline
Merge "Removing redundant {above, left}_seg_context manipulation code."
Merge "Removing output_partition from vp9."
Merge "Reformat non-RD coding flow"
Merge "Convert use_fast_lpf_pick to an enum."
Merge "Renaming and making vp9_update_mode_info_border() static."
Merge "Cleaning up vp9_svc_layercontext.c"
[svc] Add min/max q and min/max bitrate in svc test app
Merge "Rename the aq_mode files."
Reformat non-RD coding flow
Cleaning up vp9_loopfilter.c.
Removing output_partition from vp9.
Adding get_buf_from_mv() function.
Merge "Fix libvpx VP9 decoder dr memory errors"
Rename the aq_mode files.
Convert use_fast_lpf_pick to an enum.
Making c++ compiler happier.
General cleanup in vp9_decoder.{h, c}.
Removing unused members from VP9D_CONFIG struct.
Merge "Tiny vp9_picklpf.c cleanup."
Renaming and making vp9_update_mode_info_border() static.
Cleaning up vp9_svc_layercontext.c
AVX2 SAD Optimization:
Merge "Add prediction mode skipping in non-rd situation"
Merge "Cleaning up vp9_mcomp.c."
Fix libvpx VP9 decoder dr memory errors
Using local variable for token_cache.
Merge "Fix bad speed settings interaction."
Removing redundant {above, left}_seg_context manipulation code.
Merge "Reusing {above, left}_seg_context vars in both encoder and decoder."
Merge "Removing source & source_sz from VP9Decompressor struct."
Tiny vp9_picklpf.c cleanup.
Merge "changed to use correct pred_mv"
Merge "Fix a valgrind error"
Fix bad speed settings interaction.
Add prediction mode skipping in non-rd situation
Merge "Remove duplicate declaration"
Merge "Some code cleanup for cyclic refresh."
Change the min/max q validation in lossless mode
Use local vairable in rd_auto_partition_range()
Disable speed 6 for datarate test.
Some code cleanup for cyclic refresh.
Reusing {above, left}_seg_context vars in both encoder and decoder.
Merge "intrapred_test: fix inheritance"
Merge "[svc] Finalize spatial svc first pass rate control"
Removing source & source_sz from VP9Decompressor struct.
Merge "Removing mi_stream."
Log encoding time/fps in vpx_temporal_scalable_patterns
ads2armasm_ms: Match the indentation of the previous line
Merge "configure: test -m(mmx|sse|sse2|sse3) flags"
Merge "ads2armasm_ms: Add an ALIGN 4 after ENDP"
ads2armasm_ms: Add an ALIGN 4 after ENDP
Merge "Enable variable block size test in non-RD mode decision"
Merge "Cleaning up vp9_onyx_if.c and vp9_onyx_int.h."
Merge "Moving common code into vp9_update_mv_count()."