• 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
..
decode_to_md5.c Loading commit data...
decode_with_drops.c Loading commit data...
postproc.c Loading commit data...
resize_util.c Loading commit data...
set_maps.c Loading commit data...
simple_decoder.c Loading commit data...
simple_encoder.c Loading commit data...
twopass_encoder.c Loading commit data...
vp8_multi_resolution_encoder.c Loading commit data...
vp8cx_set_ref.c Loading commit data...
vp9_lossless_encoder.c Loading commit data...
vp9_spatial_svc_encoder.c Loading commit data...
vpx_temporal_svc_encoder.c Loading commit data...