minor changes from Andrew to accomodate Termux, etc

diff --git a/cinelerra-5.1/configure.ac b/cinelerra-5.1/configure.ac
index 163851d4f4f587695987dc2156bb7552678b523c..b36cb2642a807c124d75d79a1e3223632b00981d 100644 (file)
--- 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 1e6af0b9ef59935209f0041f97dfe454f41cc62a..b2e222d4fce766b3097884c3f74b47775851eeaa 100644 (file)
--- 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) \