aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarl Eugen Hoyos <cehoyos@rainbow.studorg.tuwien.ac.at>2009-01-05 23:25:58 +0000
committerCarl Eugen Hoyos <cehoyos@rainbow.studorg.tuwien.ac.at>2009-01-05 23:25:58 +0000
commit272081b0f8617f87168b9730e960a1f88d5557e0 (patch)
treeea9e6bcdc41bfb83ac37525fc7eae694251bb6bd
parent8423186e6562b48ba925604b6a25ff6a0fe44feb (diff)
downloadffmpeg-272081b0f8617f87168b9730e960a1f88d5557e0.tar.gz
Export VDPAU support by installing vdpau.h.
Originally committed as revision 16445 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rwxr-xr-xconfigure6
-rw-r--r--libavcodec/Makefile2
2 files changed, 7 insertions, 1 deletions
diff --git a/configure b/configure
index cfa5735961..8706c085de 100755
--- a/configure
+++ b/configure
@@ -84,6 +84,7 @@ show_help(){
echo " --enable-beosthreads use BeOS threads [no]"
echo " --enable-os2threads use OS/2 threads [no]"
echo " --enable-pthreads use pthreads [no]"
+ echo " --enable-vdpau enable VDPAU support [no]"
echo " --enable-w32threads use Win32 threads [no]"
echo " --enable-x11grab enable X11 grabbing [no]"
echo " --enable-xvmc enable XvMC support [no]"
@@ -776,6 +777,7 @@ CONFIG_LIST="
small
static
swscale
+ vdpau
vhook
x11grab
xvmc
@@ -1041,6 +1043,7 @@ libvorbis_encoder_deps="libvorbis"
libx264_encoder_deps="libx264"
libxvid_encoder_deps="libxvid"
mpeg4aac_decoder_deps="libfaad"
+vdpau_deps="vdpau_vdpau_h vdpau_vdpau_x11_h"
# demuxers / muxers
ac3_demuxer_deps="ac3_parser"
@@ -1827,6 +1830,8 @@ check_header sys/mman.h
check_header sys/resource.h
check_header sys/select.h
check_header termios.h
+check_header vdpau/vdpau.h
+check_header vdpau/vdpau_x11.h
check_header X11/extensions/XvMClib.h
if ! enabled_any memalign memalign_hack && enabled need_memalign ; then
@@ -2192,6 +2197,7 @@ echo "libtheora enabled ${libtheora-no}"
echo "libvorbis enabled ${libvorbis-no}"
echo "libx264 enabled ${libx264-no}"
echo "libxvid enabled ${libxvid-no}"
+echo "vdpau enabled ${vdpau-no}"
echo "zlib enabled ${zlib-no}"
echo "bzlib enabled ${bzlib-no}"
echo
diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 0ad34314cb..f99dbbb403 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -3,7 +3,7 @@ include $(SUBDIR)../config.mak
NAME = avcodec
FFLIBS = avutil
-HEADERS = avcodec.h opt.h
+HEADERS = avcodec.h opt.h vdpau.h
OBJS = allcodecs.o \
audioconvert.o \