-
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
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