review.tizen.org Git - platform/upstream/libvpx.git/commit

projects / platform / upstream / libvpx.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 3b5f8ad e47306e)

author	John Koleszar <jkoleszar@google.com>
	Fri, 16 Sep 2011 13:22:29 +0000 (09:22 -0400)
committer	John Koleszar <jkoleszar@google.com>
	Fri, 16 Sep 2011 13:22:29 +0000 (09:22 -0400)
commit	62371d382a4fb2570c60e0a0948bd32e91790f2a
tree	8c26234167e8fd034aea025ef5dd7aff93950b61	tree \| snapshot
parent	3b5f8adcc0f4903c7fbc3986ff6f2f3356445c5b	commit \| diff
parent	e47306eb7ac76f15931c917297b313a0985102e1	commit \| diff

Merge remote branch 'internal/upstream' into HEAD

Conflicts:
vp8/decoder/decodframe.c
vp8/encoder/encodeframe.c
vp8/encoder/encodemb.c

Change-Id: I6e0d1669e4409a2dfd73ba2c7038d730842d3953

vp8/common/blockd.h	diff1 \|	diff2 \|	blob \| history
vp8/decoder/decodframe.c	diff1 \|	diff2 \|	blob \| history
vp8/decoder/threading.c	diff1 \|	diff2 \|	blob \| history
vp8/encoder/encodeframe.c	diff1 \|	diff2 \|	blob \| history
vp8/encoder/encodemb.c	diff1 \|	diff2 \|	blob \| history
vp8/encoder/encodemb.h	diff1 \|	diff2 \|	blob \| history
vp8/encoder/ethreading.c	diff1 \|	diff2 \|	blob \| history
vp8/encoder/rdopt.c	diff1 \|	diff2 \|	blob \| history

Domain: Multimedia / Codec;