aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarl Eugen Hoyos <cehoyos@ag.or.at>2014-03-23 13:24:07 +0100
committerCarl Eugen Hoyos <cehoyos@ag.or.at>2014-03-23 19:05:59 +0100
commit13682b48e95c91cbcd80bc45880e09eca1ebdee2 (patch)
treecb2834ef3023bbc28137d2fa50817ed55f8baa89
parentefe259a27e56ae2f68b924a7d24b08b69b3badc8 (diff)
downloadffmpeg-13682b48e95c91cbcd80bc45880e09eca1ebdee2.tar.gz
Autodetect VDA like all other hardware acccelerations.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 942cded690bc6dc931c60078f39cf0f339a89058) Conflicts: configure
-rw-r--r--Changelog1
-rwxr-xr-xconfigure4
2 files changed, 3 insertions, 2 deletions
diff --git a/Changelog b/Changelog
index fe2f052bed..ef8696fb4f 100644
--- a/Changelog
+++ b/Changelog
@@ -28,6 +28,7 @@ version 2.2:
- Support DNx444
- libx265 encoder
- dejudder filter
+- Autodetect VDA like all other hardware accelerations
version 2.1:
diff --git a/configure b/configure
index 39daa52ee5..e2674ac626 100755
--- a/configure
+++ b/configure
@@ -149,7 +149,7 @@ Component options:
Hardware accelerators:
--disable-dxva2 disable DXVA2 code [autodetect]
--disable-vaapi disable VAAPI code [autodetect]
- --enable-vda enable VDA code
+ --disable-vda disable VDA code [autodetect]
--disable-vdpau disable VDPAU code [autodetect]
Individual component options:
@@ -2504,7 +2504,7 @@ enable static
enable swscale_alpha
# Enable hwaccels by default.
-enable dxva2 vaapi vdpau xvmc
+enable dxva2 vaapi vda vdpau xvmc
# build settings
SHFLAGS='-shared -Wl,-soname,$$(@F)'