aboutsummaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2011-11-15 03:13:42 +0100
committerMichael Niedermayer <michaelni@gmx.at>2011-11-15 03:13:42 +0100
commita72580fc9efeb674257b4754ca5de0fa34b09be8 (patch)
tree317e10288d30721f1f20c6c5bb9d99945d4351bd /configure
parentbe4c9a440f4e8b6ea01112d98a2cc128b8c52295 (diff)
parent3f5d6a665aba439a9309ed735e71403d236a313d (diff)
downloadffmpeg-a72580fc9efeb674257b4754ca5de0fa34b09be8.tar.gz
Merge remote-tracking branch 'qatar/master'
* qatar/master: binkvideo: simplify and remove invalid shifts pulse: compute frame_duration once and fix it lavf: simplify format_child_class_next() hwaccel: OS X Video Decoder Acceleration (VDA) support. doc: add support for an optional navigation bar in texi2html pages Conflicts: configure libavcodec/Makefile libavcodec/allcodecs.c libavcodec/vda.c libavcodec/vda.h libavcodec/vda_h264.c libavcodec/vda_internal.h libavcodec/version.h libavformat/options.c libavutil/avutil.h libavutil/pixfmt.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure2
1 files changed, 2 insertions, 0 deletions
diff --git a/configure b/configure
index 891fd5564d..8ff3f7f4e5 100755
--- a/configure
+++ b/configure
@@ -110,6 +110,7 @@ Configuration options:
--disable-mdct disable MDCT code
--disable-rdft disable RDFT code
--enable-vaapi enable VAAPI code [autodetect]
+ --enable-vda enable VDA code [autodetect]
--enable-vdpau enable VDPAU code [autodetect]
--disable-dxva2 disable DXVA2 code
--disable-vda disable VDA code
@@ -1496,6 +1497,7 @@ zmbv_encoder_select="zlib"
crystalhd_deps="libcrystalhd_libcrystalhd_if_h"
vaapi_deps="va_va_h"
+vda_deps="VideoDecodeAcceleration_VDADecoder_h pthreads"
vdpau_deps="vdpau_vdpau_h vdpau_vdpau_x11_h"
# parsers