[vlc-commits] [Git][videolan/vlc][master] 2 commits: configure: fix have_avcodec usage

[Steve Lhomme (@robUx4)]

Steve Lhomme pushed to branch master at VideoLAN / VLC


Commits:
0bdab05d by Steve Lhomme at 2023-08-31T13:47:53+00:00
configure: fix have_avcodec usage

Regression from 8b21c2fc760b672f33760b7472b316f562308f4c after the variable
was removed. We can just test that avcodec was not disabled. If it was
enabled and it's not found, it won't be used.

- - - - -
57b21d81 by Steve Lhomme at 2023-08-31T13:47:53+00:00
configure: fix the d3d11va/avcodec mismatch error position

Regression from 8b62450cea1118578f2de3427ac01f34db52dcef.

- - - - -


1 changed file:

- configure.ac


Changes:

=====================================
configure.ac
=====================================
@@ -2578,7 +2578,7 @@ AC_ARG_ENABLE([dxva2],
 have_avcodec_dxva2="no"
 AS_IF([test "${enable_dxva2}" != "no"], [
   AS_IF([test "${SYS}" = "mingw32"], [
-    AS_IF([test "${have_avcodec}" = "yes"], [
+    AS_IF([test "${enable_avcodec}" != "no"], [
         AC_CHECK_HEADERS([libavcodec/dxva2.h], [
             AC_MSG_NOTICE([DxVA2 acceleration activated])
             have_avcodec_dxva2="yes"
@@ -2607,7 +2607,7 @@ AC_ARG_ENABLE([d3d11va],
 have_avcodec_d3d11va="no"
 AS_IF([test "${enable_d3d11va}" != "no"], [
   AS_IF([test "${SYS}" = "mingw32"], [
-    AS_IF([test "${have_avcodec}" = "yes"], [
+    AS_IF([test "${enable_avcodec}" != "no"], [
         AC_CHECK_HEADERS([libavcodec/d3d11va.h], [
             AC_MSG_NOTICE([D3D11 acceleration activated])
             have_avcodec_d3d11va="yes"
@@ -2618,10 +2618,10 @@ AS_IF([test "${enable_d3d11va}" != "no"], [
                 AC_MSG_WARN([d3d11va is present but libavcodec/d3d11va.h is missing ])
             ])
         ])
-    ])
-  ],[
-    AS_IF([test "x${enable_d3d11va}" != "x"], [
-      AC_MSG_ERROR([--enable-d3d11va and --disable-avcodec options are mutually exclusive.])
+    ],[
+        AS_IF([test "x${enable_d3d11va}" != "x"], [
+          AC_MSG_ERROR([--enable-d3d11va and --disable-avcodec options are mutually exclusive.])
+        ])
     ])
   ])
 ])
@@ -2681,7 +2681,7 @@ dnl
 
 AC_ARG_ENABLE([avformat],
 AS_HELP_STRING([--enable-avformat], [libavformat containers (default enabled)]),, [
-  enable_avformat="${have_avcodec}"
+  enable_avformat="${enable_avcodec}"
 ])
 have_avformat="no"
 AS_IF([test "${enable_avformat}" != "no"], [
@@ -3368,7 +3368,7 @@ AS_IF([test "${enable_vdpau}" != "no"], [
 AM_CONDITIONAL([HAVE_VDPAU], [test "${have_vdpau}" = "yes"])
 
 have_avcodec_vdpau="no"
-AS_IF([test "${have_vdpau}" = "yes" -a "${have_avcodec}" = "yes"], [
+AS_IF([test "${have_vdpau}" = "yes" -a "${enable_avcodec}" != "no"], [
   PKG_CHECK_EXISTS([libavcodec >= 56.19.100], [
     have_avcodec_vdpau="yes"
     AC_MSG_NOTICE([VDPAU decoding acceleration activated])



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/3962ac19d0681ba88a64364e5825f3041a94a53f...57b21d81d8bb86a3026362c78e117f23955935c7

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/3962ac19d0681ba88a64364e5825f3041a94a53f...57b21d81d8bb86a3026362c78e117f23955935c7
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance