upgrade to ffmpeg 4.2, rework mask for speedup

[goodguy/cinelerra.git] / cinelerra-5.1 / configure.ac

diff --git a/cinelerra-5.1/configure.ac b/cinelerra-5.1/configure.ac
index 77fe5cacd36f7089ed26dda758669331c40df8b6..5abf6a65cc1cec4eb531bd5fff94f71e8918e294 100644 (file)
--- a/cinelerra-5.1/configure.ac
+++ b/cinelerra-5.1/configure.ac
@@ -186,7 +186,7 @@ PKG_3RD([esound],[no],
   [ . ])
 
 PKG_3RD([ffmpeg],[yes],
-  [ffmpeg-4.1],
+  [ffmpeg-4.2],
   [ libavutil/libavutil.a \
     libavcodec/libavcodec.a \
     libpostproc/libpostproc.a \
@@ -691,7 +691,7 @@ CHECK_WANT([LV2], [auto], [use lv2], [
  CFLAGS="$saved_CFLAGS"])
 
 CHECK_WANT([CUDA], [auto], [build cuda plugins], [
-  CHECK_HEADERS([CUDA], [cuda sdk], [/usr/local/cuda/include/cuda.h])])
+  CHECK_HEADERS([CUDA], [cuda sdk], [${CUDA_PATH:-/usr/local/cuda}/include/cuda.h])])
 
 CHECK_WANT([DL], [auto], [system has libdl], [
  CHECK_LIB([DL], [dl], [dlopen])])