• 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
build Loading commit data...
examples Loading commit data...
test Loading commit data...
third_party Loading commit data...
tools Loading commit data...
vp10 Loading commit data...
vp8 Loading commit data...
vp9 Loading commit data...
vpx Loading commit data...
vpx_dsp Loading commit data...
vpx_mem Loading commit data...
vpx_ports Loading commit data...
vpx_scale Loading commit data...
vpx_util Loading commit data...
.gitattributes Loading commit data...
.gitignore Loading commit data...
.mailmap Loading commit data...
AUTHORS Loading commit data...
CHANGELOG Loading commit data...
LICENSE Loading commit data...
PATENTS Loading commit data...
README Loading commit data...
args.c Loading commit data...
args.h Loading commit data...
codereview.settings Loading commit data...
configure Loading commit data...
docs.mk Loading commit data...
examples.mk Loading commit data...
ivfdec.c Loading commit data...
ivfdec.h Loading commit data...
ivfenc.c Loading commit data...
ivfenc.h Loading commit data...
keywords.dox Loading commit data...
libs.doxy_template Loading commit data...
libs.mk Loading commit data...
mainpage.dox Loading commit data...
md5_utils.c Loading commit data...
md5_utils.h Loading commit data...
rate_hist.c Loading commit data...
rate_hist.h Loading commit data...
solution.mk Loading commit data...
tools_common.c Loading commit data...
tools_common.h Loading commit data...
usage.dox Loading commit data...
usage_cx.dox Loading commit data...
usage_dx.dox Loading commit data...
video_common.h Loading commit data...
video_reader.c Loading commit data...
video_reader.h Loading commit data...
video_writer.c Loading commit data...
video_writer.h Loading commit data...
vpxdec.c Loading commit data...
vpxenc.c Loading commit data...
vpxenc.h Loading commit data...
vpxstats.c Loading commit data...
vpxstats.h Loading commit data...
warnings.c Loading commit data...
warnings.h Loading commit data...
webmdec.cc Loading commit data...
webmdec.h Loading commit data...
webmenc.cc Loading commit data...
webmenc.h Loading commit data...
y4menc.c Loading commit data...
y4menc.h Loading commit data...
y4minput.c Loading commit data...
y4minput.h Loading commit data...