]> granicus.if.org Git - libvpx/commit
Merge branch 'master' into nextgenv2
authorYaowu Xu <yaowu@google.com>
Mon, 11 Jan 2016 18:27:35 +0000 (10:27 -0800)
committerDebargha Mukherjee <debargha@google.com>
Wed, 13 Jan 2016 21:18:06 +0000 (13:18 -0800)
commit0367f32ea87e1b224768ca995000709fbf14e7eb
treeacb4dfeba6df34d7ff9aa5af2bfe9854eb1f9b46
parent387a10e3dcae530c83af31be95e8aef5064b0f5b
parenta0900fd0db5408da029fd3c71ec1f9d49ff98b3f
Merge branch 'master' into nextgenv2

Manually resovled the following conflicts:
vp10/common/blockd.h
vp10/common/entropy.h
vp10/common/entropymode.c
vp10/common/entropymode.h
vp10/common/enums.h
vp10/common/thread_common.c
vp10/decoder/decodeframe.c
vp10/decoder/decodemv.c
vp10/encoder/bitstream.c
vp10/encoder/encodeframe.c
vp10/encoder/rd.c
vp10/encoder/rdopt.c

Change-Id: I15d20ce5292b70f0c2b4ba55c1f1318181481596
16 files changed:
vp10/common/blockd.h
vp10/common/entropy.h
vp10/common/entropymode.c
vp10/common/entropymode.h
vp10/common/enums.h
vp10/common/thread_common.c
vp10/decoder/decodeframe.c
vp10/decoder/decodemv.c
vp10/encoder/bitstream.c
vp10/encoder/bitstream.h
vp10/encoder/encodeframe.c
vp10/encoder/encoder.c
vp10/encoder/encoder.h
vp10/encoder/rd.c
vp10/encoder/rdopt.c
vp10/encoder/subexp.h