Merge remote branch 'vdpau/pipe-video' into pipe-video
authorChristian König <deathsimple@vodafone.de>
Mon, 10 Jan 2011 22:41:08 +0000 (23:41 +0100)
committerChristian König <deathsimple@vodafone.de>
Mon, 10 Jan 2011 22:41:08 +0000 (23:41 +0100)
commit9032d2a13ecd019206a48767d9205c0aafa7cca2
tree5bd816287ab7ace941a455e02b1da7bd94571cf9
parentb725bbebae19890ceaaa31c1d7fb7f155ac3b6ef
parent2b296ec77c2b95e7632b45100de5a0878ac2a294
Merge remote branch 'vdpau/pipe-video' into pipe-video

Conflicts:
src/gallium/auxiliary/vl/vl_mpeg12_mc_renderer.c
src/gallium/drivers/softpipe/sp_video_context.c
src/gallium/include/pipe/p_format.h
src/gallium/state_trackers/xorg/xvmc/context.c
src/gallium/tests/unit/SConscript
configs/autoconf.in
configure.ac
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/include/pipe/p_defines.h
src/gallium/include/pipe/p_screen.h
src/gallium/include/pipe/p_video_context.h
src/gallium/include/pipe/p_video_state.h
src/gallium/state_trackers/xorg/xvmc/subpicture.c