git.libre-soc.org Git - mesa.git/commit - src/gallium/state_trackers/xorg/xvmc/xvmc

author	Younes Manton <younes.m@gmail.com>
	Sun, 6 Dec 2009 21:44:11 +0000 (16:44 -0500)
committer	Younes Manton <younes.m@gmail.com>
	Sun, 6 Dec 2009 21:44:11 +0000 (16:44 -0500)
commit	447dddb93d8dc2551ef7a9c43004237c7a8dd2dd
tree	de18c6e4c2b071923345bcc1fa876459c4148a70	tree
parent	9e8ab2e7c1b8ff5279d4247b8690c9bfc57f7e02	commit \| diff
parent	c574f515f0aa20ccc3841cf61a6124bc5996e7b2	commit \| diff

Merge branch 'master' into pipe-video

Conflicts:

src/gallium/auxiliary/vl/vl_compositor.c
src/gallium/auxiliary/vl/vl_compositor.h
src/gallium/auxiliary/vl/vl_mpeg12_mc_renderer.c
src/gallium/auxiliary/vl/vl_shader_build.c

RSS Atom

src/gallium/auxiliary/vl/vl_compositor.c	diff1 \|	diff2 \|	blob \| history
src/gallium/auxiliary/vl/vl_mpeg12_mc_renderer.c	diff1 \|	diff2 \|	blob \| history
src/gallium/auxiliary/vl/vl_mpeg12_mc_renderer.h	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/nv40/nv40_miptree.c	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/nv40/nv40_state.h	diff1 \|	diff2 \|	blob \| history
src/gallium/state_trackers/xorg/xvmc/subpicture.c	diff1 \|	diff2 \|	blob \| history
src/gallium/state_trackers/xorg/xvmc/surface.c	diff1 \|	diff2 \|	blob \| history
src/gallium/winsys/drm/nouveau/drm/nouveau_drm_api.c	diff1 \|	diff2 \|	blob \| history
src/gallium/winsys/g3dvl/xlib/xsp_winsys.c	diff1 \|	diff2 \|	blob \| history