diff options
| author | Petri Hintukainen <phintuka@users.sourceforge.net> | 2013-01-17 15:01:23 +0200 |
|---|---|---|
| committer | Petri Hintukainen <phintuka@users.sourceforge.net> | 2013-01-17 15:01:23 +0200 |
| commit | e2c8a63b302163665de3185b43595f69b5c6468b (patch) | |
| tree | 53bf623e91ab2c6aad5d277d640d41f8391930f6 /m4 | |
| parent | 62b24c4a35455b392b7f886f2a3e44261ed2d2a9 (diff) | |
| download | xine-lib-e2c8a63b302163665de3185b43595f69b5c6468b.tar.gz xine-lib-e2c8a63b302163665de3185b43595f69b5c6468b.tar.bz2 | |
VAAPI decoder and video output plugin from https://github.com/huceke/xine-lib-vaapi
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/summary.m4 | 1 | ||||
| -rw-r--r-- | m4/video_out.m4 | 13 |
2 files changed, 13 insertions, 1 deletions
diff --git a/m4/summary.m4 b/m4/summary.m4 index 15fccdbf4..8e084e635 100644 --- a/m4/summary.m4 +++ b/m4/summary.m4 @@ -211,6 +211,7 @@ AC_DEFUN([XINE_LIB_SUMMARY], [ if test x"$have_opengl2" = x"yes"; then echo " - OpenGL 2.0 (with bicubic scaling)" fi + test x"$have_vaapi" = x"yes" && echo " - vaapi (Video Acceleration (VA) API for Linux)" test x"$have_vdpau" = x"yes" && echo " - vdpau (X11 Video Decode and Presentation API for Unix)" if test x"$have_sunfb" = x"yes"; then if test x"$have_sundga" = x"yes"; then diff --git a/m4/video_out.m4 b/m4/video_out.m4 index 17630758a..dcb502b0b 100644 --- a/m4/video_out.m4 +++ b/m4/video_out.m4 @@ -27,6 +27,7 @@ AC_DEFUN([XINE_VIDEO_OUT_PLUGINS], [ default_enable_xinerama=yes default_enable_xvmc=yes default_enable_vdpau=no + default_enable_vaapi=no default_with_caca=yes default_with_libstk=no @@ -56,6 +57,7 @@ AC_DEFUN([XINE_VIDEO_OUT_PLUGINS], [ default_enable_fb=yes default_enable_vidix=yes default_enable_vdpau=yes + default_enable_vaapi=yes enable_linux=yes ;; esac @@ -517,5 +519,14 @@ AC_DEFUN([XINE_VIDEO_OUT_PLUGINS], [ fi fi AM_CONDITIONAL([ENABLE_VDPAU], test x"$have_vdpau" = x"yes") - + + dnl VAAPI + XINE_ARG_ENABLE([vaapi], [Disable VAAPI output plugin]) + if test x"$no_x" != x"yes" && test x"$enable_vaapi" != x"no"; then + PKG_CHECK_MODULES([LIBVA], [libva], [have_vaapi=yes], [have_vaapi=no]) + AC_CHECK_HEADERS([va/va.h], , [have_vaapi=no]) + AC_CHECK_HEADERS([va/va_x11.h], , [have_vaapi=no]) + fi + AM_CONDITIONAL([ENABLE_VAAPI], test x"$have_vaapi" = x"yes") + ])dnl XINE_VIDEO_OUT_PLUGIN |