• Yaowu Xu's avatar
    Merge branch 'masterbase' into nextgenv2 · 4ac2ae3a
    Yaowu Xu authored
    Conflicts:
    	configure
    	test/vp9_encoder_parms_get_to_decoder.cc
    	vp10/common/blockd.h
    	vp10/common/entropymode.c
    	vp10/common/entropymode.h
    	vp10/common/idct.c
    	vp10/decoder/decodeframe.c
    	vp10/decoder/decodemv.c
    	vp10/encoder/bitstream.c
    	vp10/encoder/encodeframe.c
    	vp10/encoder/encodemb.c
    	vp10/encoder/encoder.c
    	vp10/encoder/encoder.h
    	vp10/encoder/rd.c
    	vp10/encoder/rdopt.c
    	vp10/encoder/tokenize.c
    	vp10/encoder/tokenize.h
    	vp9/decoder/vp9_decodeframe.c
    	vp9/decoder/vp9_decoder.h
    	vp9/encoder/vp9_aq_cyclicrefresh.c
    	vp9/encoder/vp9_encoder.h
    	vp9/vp9_cx_iface.c
    	vpx/vp8cx.h
    	vpx_dsp/x86/vpx_subpixel_8t_intrin_ssse3.c
    	vpx_scale/yv12config.h
    
    Change-Id: I604a329d38badec7a11e8ede16ca1404476e9b93
    4ac2ae3a
pred_common.h 8.75 KB