review.tizen.org Git - profile/ivi/libva.git/commit

projects / profile / ivi / libva.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: be46765 c4a03c1)

author	Austin Yuan <shengquan.yuan@gmail.com>
	Wed, 28 Apr 2010 23:20:56 +0000 (07:20 +0800)
committer	Austin Yuan <shengquan.yuan@gmail.com>
	Wed, 28 Apr 2010 23:20:56 +0000 (07:20 +0800)
commit	1f4d9627ffd6594380f67ee1085c7aa132397e6b
tree	3fd287e06fc6fc3563d17ef007055766f4f57521	tree \| snapshot
parent	be467652b91634b7f6c8989a78c25469ffc1827e	commit \| diff
parent	c4a03c1016cd41e22ecc3410be6759aa0e1a71cf	commit \| diff

Merge branch 'va_backend' into PO

Conflicts:
va/android/va_android.c
va/va_android.h
va/va_backend.h

Signed-off-by: Austin Yuan <shengquan.yuan@gmail.com>

va/Android.mk	diff1 \|	diff2 \|	blob \| history
va/android/drmtest.c	diff1 \|	\|	blob \| history
va/android/drmtest.h	diff1 \|	\|	blob \| history
va/android/va_android.c	diff1 \|	diff2 \|	blob \| history
va/va.h	diff1 \|	diff2 \|	blob \| history
va/va_android.h	diff1 \|	diff2 \|	blob \| history
va/va_backend.h	diff1 \|	diff2 \|	blob \| history
va/x11/va_dricommon.h	diff1 \|	diff2 \|	blob \| history

Domain: Multimedia / Media Content;