Merge remote branch 'origin/master' into pipe-video

[mesa.git] / src / gallium / auxiliary / SConscript

diff --git a/src/gallium/auxiliary/SConscript b/src/gallium/auxiliary/SConscript
index 8e422b2c11fad5fb0e46f22416dd3f6ccf95b062..84519cfd048470dec3e0ff3588360c0e20234784 100644 (file)
--- a/src/gallium/auxiliary/SConscript
+++ b/src/gallium/auxiliary/SConscript
@@ -194,12 +194,10 @@ source = [
     'util/u_transfer.c',
     'util/u_upload_mgr.c',
     'util/u_vbuf_mgr.c',
-    # Disabling until pipe-video branch gets merged in
-    #'vl/vl_bitstream_parser.c',
-    #'vl/vl_mpeg12_mc_renderer.c',
-    #'vl/vl_compositor.c',
-    #'vl/vl_csc.c',
-    #'vl/vl_shader_build.c',
+    'vl/vl_bitstream_parser.c',
+    'vl/vl_mpeg12_mc_renderer.c',
+    'vl/vl_compositor.c',
+    'vl/vl_csc.c',
 ]
 
 if env['llvm']: