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

projects / platform / upstream / libvpx.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 6240002 939f64f)

author	John Koleszar <jkoleszar@google.com>
	Thu, 11 Aug 2011 17:01:45 +0000 (13:01 -0400)
committer	John Koleszar <jkoleszar@google.com>
	Thu, 11 Aug 2011 17:01:45 +0000 (13:01 -0400)
commit	a16cd74ba15a43cb2e13284938c8b0c51bfbf3af
tree	b49d9728ac04a8316420305b0538dac0d6db758b	tree \| snapshot
parent	62400028e22b3544eac09724afe45f3cd55766a1	commit \| diff
parent	939f64f68efc837a98a5c80913a4bde50b79854f	commit \| diff

Merge remote branch 'internal/upstream-experimental' into HEAD

Conflicts:
vp8/decoder/detokenize.c
vp8/decoder/onyxd_if.c
vp8/vp8_common.mk

Change-Id: Ifca1108186a8bc715da86a44021ee2fa5550b5b8

configure	diff1 \|	diff2 \|	blob \| history
vp8/common/onyxc_int.h	diff1 \|	diff2 \|	blob \| history
vp8/decoder/detokenize.c	diff1 \|	diff2 \|	blob \| history
vp8/decoder/onyxd_if.c	diff1 \|	diff2 \|	blob \| history
vp8/decoder/onyxd_int.h	diff1 \|	diff2 \|	blob \| history
vp8/encoder/encodeframe.c	diff1 \|	diff2 \|	blob \| history
vp8/encoder/onyx_if.c	diff1 \|	diff2 \|	blob \| history
vp8/encoder/onyx_int.h	diff1 \|	diff2 \|	blob \| history
vp8/encoder/rdopt.c	diff1 \|	diff2 \|	blob \| history
vp8/vp8_common.mk	diff1 \|	diff2 \|	blob \| history
vpxenc.c	diff1 \|	diff2 \|	blob \| history

Domain: Multimedia / Codec;