diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2009-11-20 03:46:10 +0000 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2009-11-20 03:46:10 +0000 |
| commit | c7355d9282de0d6b3d5d1923ffe06bf1587393a9 (patch) | |
| tree | 6f26f93dd9c8b8a1dca260c097b647612933e312 /m4 | |
| parent | fd7db10fedd5d3b7952c4785bec11c2692090cfb (diff) | |
| parent | 34e3074e5efa935f2022d870842517d4e0d445c4 (diff) | |
| download | xine-lib-c7355d9282de0d6b3d5d1923ffe06bf1587393a9.tar.gz xine-lib-c7355d9282de0d6b3d5d1923ffe06bf1587393a9.tar.bz2 | |
Merge from 1.1; merge vdpau (with adjustments for 1.2).
--HG--
rename : include/xine.h.in => include/xine.h
rename : src/xine-engine/osd.h => include/xine/osd.h
rename : src/xine-engine/video_out.h => include/xine/video_out.h
rename : src/libspudvb/xine_spudvb_decoder.c => src/spu_dec/spudvb_decoder.c
rename : src/libvdpau/Makefile.am => src/video_dec/libvdpau/Makefile.am
rename : src/libvdpau/bits_reader.h => src/video_dec/libvdpau/bits_reader.h
rename : src/libvdpau/dpb.c => src/video_dec/libvdpau/dpb.c
rename : src/libvdpau/dpb.h => src/video_dec/libvdpau/dpb.h
rename : src/libvdpau/h264_parser.c => src/video_dec/libvdpau/h264_parser.c
rename : src/libvdpau/h264_parser.h => src/video_dec/libvdpau/h264_parser.h
rename : src/libvdpau/nal.c => src/video_dec/libvdpau/nal.c
rename : src/libvdpau/nal.h => src/video_dec/libvdpau/nal.h
rename : src/libvdpau/vdpau_h264.c => src/video_dec/libvdpau/vdpau_h264.c
rename : src/libvdpau/vdpau_mpeg12.c => src/video_dec/libvdpau/vdpau_mpeg12.c
rename : src/libvdpau/vdpau_vc1.c => src/video_dec/libvdpau/vdpau_vc1.c
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/summary.m4 | 2 | ||||
| -rw-r--r-- | m4/video_out.m4 | 18 |
2 files changed, 19 insertions, 1 deletions
diff --git a/m4/summary.m4 b/m4/summary.m4 index 27ca0f645..d405f136c 100644 --- a/m4/summary.m4 +++ b/m4/summary.m4 @@ -78,6 +78,7 @@ AC_DEFUN([XINE_LIB_SUMMARY], [ test x"$have_imagemagick" = x"yes" && echo " - image" test x"$have_theora" = x"yes" && echo " - theora" test x"$have_w32dll" = x"yes" && echo " - w32dll" + test x$"have_vdpau" = x"yes" && echo " - vdpau" if test x"$with_external_ffmpeg" != x"no"; then echo " - ffmpeg (external library)" else @@ -203,6 +204,7 @@ AC_DEFUN([XINE_LIB_SUMMARY], [ echo " - OpenGL" fi fi + test x$"have_vdpau" = x"yes" && echo " - vdpau (X11 VDPAU)" if test x"$have_sunfb" = x"yes"; then if test x"$have_sundga" = x"yes"; then echo " - PGX64 (for Sun XVR100/PGX64/PGX24 cards)" diff --git a/m4/video_out.m4 b/m4/video_out.m4 index 7870b7558..8792f0b80 100644 --- a/m4/video_out.m4 +++ b/m4/video_out.m4 @@ -499,4 +499,20 @@ AC_DEFUN([XINE_VIDEO_OUT_PLUGINS], [ fi AM_CONDITIONAL([ENABLE_XVMC], [test x"$have_xvmc" = x"yes"]) AM_CONDITIONAL([ENABLE_XXMC], [test x"$have_xxmc" = x"yes"]) -])dnl XINE_VIDEO_OUT_PLUGINS + + + dnl VDPAU + AC_ARG_ENABLE([vdpau], [AS_HELP_STRING([--disable-vdpau], [Disable VDPAU output plugin])]) + if test x"$no_x" != x"yes" && test x"$enable_vdpau" != x"no"; then + AC_CHECK_HEADERS([vdpau/vdpau_x11.h], [have_vdpau=yes], [have_vdpau=no]) + if test x"$have_vdpau" = x"yes"; then + AC_CHECK_LIB([vdpau], [vdp_device_create_x11], [], [have_vdpau=no], [$X_LIBS $X_PRE_LIBS -lXext $X_EXTRA_LIBS]) + fi + if test x"$enable_vdpau" = x"yes" && test x"$have_vdpau" != x"yes"; then + AC_MSG_ERROR([VDPAU support requested, but not all requirements are met]) + fi + fi + AM_CONDITIONAL([ENABLE_VDPAU], test x"$have_vdpau" = x"yes") + +])dnl XINE_VIDEO_OUT_PLUGIN +S |