• Yaowu Xu's avatar
    Merged branch 'master' into nextgenv2 · 7c514e2d
    Yaowu Xu authored
    Resolved Conflicts in the following files:
            configure
            vp10/common/idct.c
            vp10/encoder/dct.c
            vp10/encoder/encodemb.c
            vp10/encoder/rdopt.c
    
    Change-Id: I4cb3986b0b80de65c722ca29d53a0a57f5a94316
    7c514e2d
Name
Last commit
Last update
..
arm.h Loading commit data...
arm_cpudetect.c Loading commit data...
bitops.h Loading commit data...
config.h Loading commit data...
emmintrin_compat.h Loading commit data...
emms.asm Loading commit data...
mem.h Loading commit data...
mem_ops.h Loading commit data...
mem_ops_aligned.h Loading commit data...
msvc.h Loading commit data...
system_state.h Loading commit data...
vpx_once.h Loading commit data...
vpx_ports.mk Loading commit data...
vpx_timer.h Loading commit data...
x86.h Loading commit data...
x86_abi_support.asm Loading commit data...