granicus.if.org Git - libvpx/commit

]> granicus.if.org Git - libvpx/commit

author	Yaowu Xu <yaowu@google.com>
	Wed, 20 Jul 2011 21:21:24 +0000 (14:21 -0700)
committer	Yaowu Xu <yaowu@google.com>
	Thu, 21 Jul 2011 16:01:53 +0000 (09:01 -0700)
commit	8c31484ea1fbac128e31a951a004f6f91bc1ef2f
tree	b99e86871914df1d57717d07b694eb7837d29ae3	tree \| snapshot
parent	1c24eb2b7b3a61893ea19e9e544c24a233f89921	commit \| diff

fix more merge issues

With this fix, the experimental branch now builds and encodes correctly
with the following two configure options respectively:
--enable-experimental --enable-t8x8
--enable-experimental

Change-Id: I3147c33c503fe713a85fd371e4f1a974805778bf

29 files changed:

vp8/common/blockd.h		diff \| blob \| history
vp8/common/coefupdateprobs.h		diff \| blob \| history
vp8/common/defaultcoefcounts.c		diff \| blob \| history
vp8/common/entropy.c		diff \| blob \| history
vp8/common/entropy.h		diff \| blob \| history
vp8/common/idct.h		diff \| blob \| history
vp8/common/idctllm.c		diff \| blob \| history
vp8/common/onyx.h		diff \| blob \| history
vp8/common/recon.c		diff \| blob \| history
vp8/common/reconinter.c		diff \| blob \| history
vp8/decoder/decodemv.c		diff \| blob \| history
vp8/decoder/decodframe.c		diff \| blob \| history
vp8/decoder/dequantize.c		diff \| blob \| history
vp8/decoder/dequantize.h		diff \| blob \| history
vp8/decoder/detokenize.c		diff \| blob \| history
vp8/decoder/idct_blk.c		diff \| blob \| history
vp8/decoder/onyxd_if.c		diff \| blob \| history
vp8/decoder/onyxd_int.h		diff \| blob \| history
vp8/encoder/bitstream.c		diff \| blob \| history
vp8/encoder/dct.c		diff \| blob \| history
vp8/encoder/encodeframe.c		diff \| blob \| history
vp8/encoder/encodemb.c		diff \| blob \| history
vp8/encoder/onyx_if.c		diff \| blob \| history
vp8/encoder/onyx_int.h		diff \| blob \| history
vp8/encoder/quantize.c		diff \| blob \| history
vp8/encoder/quantize.h		diff \| blob \| history
vp8/encoder/rdopt.c		diff \| blob \| history
vp8/encoder/tokenize.c		diff \| blob \| history
vp8/encoder/tokenize.h		diff \| blob \| history

Unnamed repository; edit this file 'description' to name the repository.

RSS Atom