Fix problems created by Merge
authorChristian König <deathsimple@vodafone.de>
Sat, 16 Oct 2010 14:41:09 +0000 (16:41 +0200)
committerChristian König <deathsimple@vodafone.de>
Sat, 16 Oct 2010 14:41:09 +0000 (16:41 +0200)
commitb13a0af510b71e86f9634dc959dc355ea7044674
treed9e830ba7d34dff7bceb936a0712909e1a1fadb7
parent695cc370a280a637f411f5ff3877b3fd1c05e424
Fix problems created by Merge
src/gallium/auxiliary/vl/vl_compositor.c
src/gallium/auxiliary/vl/vl_mpeg12_mc_renderer.c
src/gallium/drivers/softpipe/sp_video_context.c
src/gallium/winsys/g3dvl/xlib/xsp_winsys.c