• Johann's avatar
    Merge branch 'master' into experimental · 32a5c528
    Johann authored
    Conflicts:
    	vp9/common/vp9_findnearmv.c
    	vp9/common/vp9_rtcd_defs.sh
    	vp9/decoder/vp9_decodframe.c
    	vp9/decoder/x86/vp9_dequantize_sse2.c
    	vp9/encoder/vp9_rdopt.c
    	vp9/vp9_common.mk
    
    Resolve file name changes in favor of master. Resolve rdopt changes in
    favor of experimental, preserving the newer experiments.
    
    Change-Id: If51ed8f457470281c7b20a5c1a2f4ce2cf76c20f
    32a5c528
vp9_dx_iface.c 22.5 KB