diff options
| author | Christian König <deathsimple@vodafone.de> | 2011-01-10 23:41:08 +0100 |
|---|---|---|
| committer | Christian König <deathsimple@vodafone.de> | 2011-01-10 23:41:08 +0100 |
| commit | 9032d2a13ecd019206a48767d9205c0aafa7cca2 (patch) | |
| tree | 5bd816287ab7ace941a455e02b1da7bd94571cf9 /configs/autoconf.in | |
| parent | b725bbebae19890ceaaa31c1d7fb7f155ac3b6ef (diff) | |
| parent | 2b296ec77c2b95e7632b45100de5a0878ac2a294 (diff) | |
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
Diffstat (limited to 'configs/autoconf.in')
| -rw-r--r-- | configs/autoconf.in | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/configs/autoconf.in b/configs/autoconf.in index e2d70c63a1..1f75a9d92c 100644 --- a/configs/autoconf.in +++ b/configs/autoconf.in @@ -157,6 +157,12 @@ DRI_DRIVER_SEARCH_DIR = @DRI_DRIVER_SEARCH_DIR@ # EGL driver install directory EGL_DRIVER_INSTALL_DIR = @EGL_DRIVER_INSTALL_DIR@ +# VDPAU library install directory +VDPAU_LIB_INSTALL_DIR=@VDPAU_LIB_INSTALL_DIR@ + +# VA library install directory +VA_LIB_INSTALL_DIR=@VA_LIB_INSTALL_DIR@ + # Xorg driver install directory (for xorg state-tracker) XORG_DRIVER_INSTALL_DIR = @XORG_DRIVER_INSTALL_DIR@ |