• 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
Name
Last commit
Last update
..
arm Loading commit data...
ppc Loading commit data...
x86 Loading commit data...
bitstream.c Loading commit data...
bitstream.h Loading commit data...
block.h Loading commit data...
boolhuff.c Loading commit data...
boolhuff.h Loading commit data...
dct.c Loading commit data...
dct_value_cost.h Loading commit data...
dct_value_tokens.h Loading commit data...
defaultcoefcounts.h Loading commit data...
denoising.c Loading commit data...
denoising.h Loading commit data...
encodeframe.c Loading commit data...
encodeframe.h Loading commit data...
encodeintra.c Loading commit data...
encodeintra.h Loading commit data...
encodemb.c Loading commit data...
encodemb.h Loading commit data...
encodemv.c Loading commit data...
encodemv.h Loading commit data...
ethreading.c Loading commit data...
firstpass.c Loading commit data...
firstpass.h Loading commit data...
lookahead.c Loading commit data...
lookahead.h Loading commit data...
mcomp.c Loading commit data...
mcomp.h Loading commit data...
modecosts.c Loading commit data...
modecosts.h Loading commit data...
mr_dissim.c Loading commit data...
mr_dissim.h Loading commit data...
onyx_if.c Loading commit data...
onyx_int.h Loading commit data...
pickinter.c Loading commit data...
pickinter.h Loading commit data...
picklpf.c Loading commit data...
psnr.c Loading commit data...
psnr.h Loading commit data...
quantize.c Loading commit data...
quantize.h Loading commit data...
ratectrl.c Loading commit data...
ratectrl.h Loading commit data...
rdopt.c Loading commit data...
rdopt.h Loading commit data...
segmentation.c Loading commit data...
segmentation.h Loading commit data...
ssim.c Loading commit data...
temporal_filter.c Loading commit data...
tokenize.c Loading commit data...
tokenize.h Loading commit data...
treewriter.c Loading commit data...
treewriter.h Loading commit data...
vp8_asm_enc_offsets.c Loading commit data...