From ca291584e0e71043cb28adc95a51cfc3d1aa1137 Mon Sep 17 00:00:00 2001 From: Andrew Randrianasulu Date: Tue, 8 Mar 2022 05:54:05 +0300 Subject: [PATCH 2/3] Remove libavdevice from ffmpeg build, fix landroid-shmem link on termux, libvpx high bit dept --- cinelerra-5.1/configure.ac | 3 +-- cinelerra-5.1/thirdparty/Makefile | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/cinelerra-5.1/configure.ac b/cinelerra-5.1/configure.ac index 163851d4..b36cb264 100644 --- a/cinelerra-5.1/configure.ac +++ b/cinelerra-5.1/configure.ac @@ -196,7 +196,6 @@ PKG_3RD([ffmpeg],[yes], [ libavutil/libavutil.a \ libavcodec/libavcodec.a \ libpostproc/libpostproc.a \ - libavdevice/libavdevice.a \ libavformat/libavformat.a \ libswscale/libswscale.a \ libavfilter/libavfilter.a \ @@ -1055,7 +1054,7 @@ fi if test [ "$(uname -o)"] = "Android" ; then # termux -EXTRA_LIBS+=' -liconv' +EXTRA_LIBS+=' -liconv -landroid-shmem' fi # intel lock elision bugs diff --git a/cinelerra-5.1/thirdparty/Makefile b/cinelerra-5.1/thirdparty/Makefile index ce41db9f..2e77d4d7 100644 --- a/cinelerra-5.1/thirdparty/Makefile +++ b/cinelerra-5.1/thirdparty/Makefile @@ -130,7 +130,7 @@ esound.mak_vars+= CFLAGS="" esound.ldflags=" -lm -lstdc++" fftw.cfg_params= --disable-fortran --enable-shared=no ffmpeg.cfg_params= \ - --enable-pthreads --enable-gpl --disable-ffplay \ + --enable-pthreads --disable-avdevice --enable-gpl --disable-ffplay \ $(call if_want,VAAPI,--enable-vaapi,--disable-vaapi) \ $(call if_want,VDPAU,--enable-vdpau,--disable-vdpau) \ $(call if_want,NV, --enable-nvenc --enable-nvdec --enable-ffnvcodec) \ -- 2.35.1