diff mbox

[FFmpeg-devel,02/16] build: treat crystalhd like other hwaccels

Message ID 20170830120915.13050-3-u@pkh.me
State New
Headers show

Commit Message

Clément Bœsch Aug. 30, 2017, 12:09 p.m. UTC
From: Clément Bœsch <cboesch@gopro.com>

---
 configure | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

Comments

Philip Langdale Sept. 1, 2017, 1:21 a.m. UTC | #1
On Wed, 30 Aug 2017 14:09:01 +0200
Clément Bœsch <u@pkh.me> wrote:

> From: Clément Bœsch <cboesch@gopro.com>
> 
> ---
>  configure | 7 ++++---
>  1 file changed, 4 insertions(+), 3 deletions(-)
> 
> diff --git a/configure b/configure
> index 44e45791c2..a9932aeba6 100755
> --- a/configure
> +++ b/configure
> @@ -1532,7 +1532,6 @@ EXTERNAL_LIBRARY_LIST="
>      $EXTERNAL_LIBRARY_VERSION3_LIST
>      $EXTERNAL_LIBRARY_GPLV3_LIST
>      chromaprint
> -    crystalhd
>      gcrypt
>      gnutls
>      jni
> @@ -1589,6 +1588,7 @@ EXTERNAL_LIBRARY_LIST="
>  "
>  HWACCEL_AUTODETECT_LIBRARY_LIST="
>      audiotoolbox
> +    crystalhd
>      cuda
>      cuvid
>      d3d11va
> @@ -3597,7 +3597,7 @@ done
>  enable_weak audiotoolbox
>  
>  # Enable hwaccels by default.
> -enable_weak d3d11va dxva2 vaapi vda vdpau videotoolbox_hwaccel xvmc
> +enable_weak crystalhd d3d11va dxva2 vaapi vda vdpau
> videotoolbox_hwaccel xvmc enable_weak xlib
>  
>  enable_weak cuda cuvid nvenc vda_framework videotoolbox
> videotoolbox_encoder @@ -5808,7 +5808,6 @@ enabled bzlib && check_lib
> bzlib bzlib.h BZ2_bzlibVersion    -lbz2 enabled  lzma && check_lib
> lzma   lzma.h lzma_version_number -llzma 
>  check_lib libm math.h sin -lm && LIBM="-lm"
> -disabled crystalhd || check_lib crystalhd "stdint.h
> libcrystalhd/libcrystalhd_if.h" DtsCrystalHDVersion -lcrystalhd 
>  atan2f_args=2
>  copysign_args=2
> @@ -6180,6 +6179,8 @@ enabled vdpau &&
>  enabled vdpau &&
>      check_lib vdpau_x11 "vdpau/vdpau.h vdpau/vdpau_x11.h"
> vdp_device_create_x11 -lvdpau -lX11 
> +enabled crystalhd && check_lib crystalhd "stdint.h
> libcrystalhd/libcrystalhd_if.h" DtsCrystalHDVersion -lcrystalhd +
>  if enabled x86; then
>      case $target_os in
>          mingw32*|mingw64*|win32|win64|linux|cygwin*)

This continues to be fine.


--phil
diff mbox

Patch

diff --git a/configure b/configure
index 44e45791c2..a9932aeba6 100755
--- a/configure
+++ b/configure
@@ -1532,7 +1532,6 @@  EXTERNAL_LIBRARY_LIST="
     $EXTERNAL_LIBRARY_VERSION3_LIST
     $EXTERNAL_LIBRARY_GPLV3_LIST
     chromaprint
-    crystalhd
     gcrypt
     gnutls
     jni
@@ -1589,6 +1588,7 @@  EXTERNAL_LIBRARY_LIST="
 "
 HWACCEL_AUTODETECT_LIBRARY_LIST="
     audiotoolbox
+    crystalhd
     cuda
     cuvid
     d3d11va
@@ -3597,7 +3597,7 @@  done
 enable_weak audiotoolbox
 
 # Enable hwaccels by default.
-enable_weak d3d11va dxva2 vaapi vda vdpau videotoolbox_hwaccel xvmc
+enable_weak crystalhd d3d11va dxva2 vaapi vda vdpau videotoolbox_hwaccel xvmc
 enable_weak xlib
 
 enable_weak cuda cuvid nvenc vda_framework videotoolbox videotoolbox_encoder
@@ -5808,7 +5808,6 @@  enabled bzlib && check_lib bzlib bzlib.h BZ2_bzlibVersion    -lbz2
 enabled  lzma && check_lib lzma   lzma.h lzma_version_number -llzma
 
 check_lib libm math.h sin -lm && LIBM="-lm"
-disabled crystalhd || check_lib crystalhd "stdint.h libcrystalhd/libcrystalhd_if.h" DtsCrystalHDVersion -lcrystalhd
 
 atan2f_args=2
 copysign_args=2
@@ -6180,6 +6179,8 @@  enabled vdpau &&
 enabled vdpau &&
     check_lib vdpau_x11 "vdpau/vdpau.h vdpau/vdpau_x11.h" vdp_device_create_x11 -lvdpau -lX11
 
+enabled crystalhd && check_lib crystalhd "stdint.h libcrystalhd/libcrystalhd_if.h" DtsCrystalHDVersion -lcrystalhd
+
 if enabled x86; then
     case $target_os in
         mingw32*|mingw64*|win32|win64|linux|cygwin*)