fix messed up cut/paste in thirdparty/Makefile / last checkin

[goodguy/history.git] / cinelerra-5.1 / thirdparty / Makefile

diff --git a/cinelerra-5.1/thirdparty/Makefile b/cinelerra-5.1/thirdparty/Makefile
index c4251e273f7949094fc106965cfc505479e18e00..ff055dc45bdad596abc5816258d85ecc0f36f07d 100644 (file)
--- a/cinelerra-5.1/thirdparty/Makefile
+++ b/cinelerra-5.1/thirdparty/Makefile
@@ -102,6 +102,7 @@ fftw.cfg_params= --disable-fortran --enable-shared=no
 ffmpeg.cfg_params= \
        --enable-pthreads --enable-gpl \
        --disable-ffserver --disable-ffplay \
+       --disable-vaapi \
        --enable-libfaac \
        --enable-libfdk-aac \
        --enable-libtwolame \
@@ -186,8 +187,11 @@ openexr.cfg_params=--enable-shared=no
 openexr.cfg_params+=--with-ilmbase-prefix=$(call bld_path,ilmbase,usr)
 speech_tools.mak_params=-j1
 twolame.cfg_params=--enable-shared=no
-x264.cfg_params= --enable-static
-x265.cfg_vars=echo "exec cmake source -DENABLE_SHARED=no" > ./configure; chmod +x ./configure;
+#$(error HAVE_HIGH_DEPTH $(HAVE_HIGH_DEPTH))
+x264.cfg_params= --enable-static $(if $(filter y,$(HAVE_HIGH_DEPTH)),--bit-depth=10)
+x265.cfg_vars=echo "exec cmake source -DENABLE_SHARED=no \
+ $(if $(filter y,$(HAVE_HIGH_DEPTH)),-DHIGH_BIT_DEPTH:BOOL=ON) \
+" > ./configure; chmod +x ./configure;
 
 # compile flag vars
 $(foreach tgt,$(TARGETS), \