review.tizen.org Git - platform/upstream/libva-intel-driver.git/commit

projects / platform / upstream / libva-intel-driver.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 828b8da fe140f0)

author	Xiang, Haihao <haihao.xiang@intel.com>
	Thu, 12 Jan 2012 08:48:21 +0000 (16:48 +0800)
committer	Xiang, Haihao <haihao.xiang@intel.com>
	Thu, 12 Jan 2012 08:48:21 +0000 (16:48 +0800)
commit	af135e2510905bdb3932fc65bf6364118a7740d9
tree	a0f24e2bd62436e80deb1982c4d03ddac5fae6ee	tree \| snapshot
parent	828b8da304619ec68558b9064be964ac5e47f99e	commit \| diff
parent	fe140f03726c603f4802e4977621b46f03fe4d3c	commit \| diff

Merge branch 'master' into vaapi-ext

Conflicts:
.gitignore
src/i965_drv_video.c
src/shaders/post_processing/Makefile.am

Signed-off-by: Xiang, Haihao <haihao.xiang@intel.com>

configure.ac	diff1 \|	diff2 \|	blob \| history
src/gen6_mfd.c	diff1 \|	diff2 \|	blob \| history
src/gen6_vme.c	diff1 \|	diff2 \|	blob \| history
src/gen7_mfd.c	diff1 \|	diff2 \|	blob \| history
src/i965_drv_video.c	diff1 \|	diff2 \|	blob \| history
src/i965_encoder.c	diff1 \|	diff2 \|	blob \| history
src/i965_media.c	diff1 \|	diff2 \|	blob \| history
src/i965_post_processing.c	diff1 \|	diff2 \|	blob \| history
src/i965_render.c	diff1 \|	diff2 \|	blob \| history
src/shaders/post_processing/gen5_6/Makefile.am	diff1 \|	\|	blob \| history

Domain: Multimedia / Uncategorized;