[FFmpeg-cvslog] configure: simplify ffnvcodec version logic

Timo Rothenpieler git at videolan.org
Fri Jun 15 16:43:47 EEST 2018


ffmpeg | branch: master | Timo Rothenpieler <timo at rothenpieler.org> | Fri Jun 15 11:18:37 2018 +0200| [6129b13dadebae7e5dc5cc09b488e8398249e283] | committer: Timo Rothenpieler

configure: simplify ffnvcodec version logic

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6129b13dadebae7e5dc5cc09b488e8398249e283
---

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

diff --git a/configure b/configure
index 994d8006e0..333e326a0a 100755
--- a/configure
+++ b/configure
@@ -5907,8 +5907,8 @@ check_type "vdpau/vdpau.h" "VdpPictureInfoHEVC"
 if ! disabled ffnvcodec; then
     check_pkg_config ffnvcodec "ffnvcodec >= 8.1.24.2" \
           "ffnvcodec/nvEncodeAPI.h ffnvcodec/dynlink_cuda.h ffnvcodec/dynlink_cuviddec.h ffnvcodec/dynlink_nvcuvid.h" "" || \
-        { test_pkg_config ffnvcodec_tmp "ffnvcodec < 8.1" "" "" && check_pkg_config ffnvcodec "ffnvcodec >= 8.0.14.2" \
-          "ffnvcodec/nvEncodeAPI.h ffnvcodec/dynlink_cuda.h ffnvcodec/dynlink_cuviddec.h ffnvcodec/dynlink_nvcuvid.h" ""; }
+      check_pkg_config ffnvcodec "ffnvcodec >= 8.0.14.2 ffnvcodec < 8.1" \
+          "ffnvcodec/nvEncodeAPI.h ffnvcodec/dynlink_cuda.h ffnvcodec/dynlink_cuviddec.h ffnvcodec/dynlink_nvcuvid.h" ""
 fi
 
 check_cpp_condition winrt windows.h "!WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)"



More information about the ffmpeg-cvslog mailing list