diff --git a/middleware/source/ffmpeg_adapt/adapt_config.sh b/middleware/source/ffmpeg_adapt/adapt_config.sh index d20b359e9882c5da3498e873900f043b1290189a..07d113367d8e8bded512cb000e46c955a18edbde 100755 --- a/middleware/source/ffmpeg_adapt/adapt_config.sh +++ b/middleware/source/ffmpeg_adapt/adapt_config.sh @@ -62,8 +62,6 @@ cancel_opt HAVE_SYMVER_ASM_LABEL #cancel_opt CONFIG_FAANDCT #cancel_opt CONFIG_FAANIDCT #cancel_opt CONFIG_FDCTDSP -#cancel_opt - make clean diff --git a/middleware/source/ffmpeg_adapt/disable_decoder_config.sh b/middleware/source/ffmpeg_adapt/disable_decoder_config.sh index 37c7fdfa45830b5b47d778c73c0e496660ff6c5f..7cda712d883cbb72bdfa20207c0687adbf2bb3c5 100755 --- a/middleware/source/ffmpeg_adapt/disable_decoder_config.sh +++ b/middleware/source/ffmpeg_adapt/disable_decoder_config.sh @@ -7,15 +7,7 @@ CFG_LINUX_COMPILER_VER=$4 CFG_OHOS_BUILD_PATH=$5 echo "CFG_CHIP_TYPE=${CFG_CHIP_TYPE} CFG_OS_TYPE=${CFG_OS_TYPE} CFG_LINUX_COMPILER_VER=${CFG_LINUX_COMPILER_VER} CFG_OHOS_BUILD_PATH=${CFG_OHOS_BUILD_PATH}" -#if [ "${CFG_COMPILE_TYPE}" == "clang" ]; then CFG_SDK_TOOLCHAIN=$CFG_OHOS_BUILD_PATH/ -#else -# if [ "${CFG_OS_TYPE}" == "ohos" ]; then -# CFG_SDK_TOOLCHAIN=$CFG_OHOS_BUILD_PATH/arm-linux-ohoseabi- -# else -# CFG_SDK_TOOLCHAIN=arm-$CFG_LINUX_COMPILER_VER-linux- -# fi -#fi configure_attr=" --prefix=./install \ --disable-autodetect \ @@ -96,7 +88,7 @@ configure_attr+=" --cpu=cortex-a7 --arch=armv7-a --cross-prefix=${CFG_SDK_TOOLCH fi if [ "${CFG_CHIP_TYPE}" == "hi3516dv300" ]; then -echo "###########hi3516dv300 =? ${CFG_CHIP_TYPE}########" +echo "hi3516dv300 =? ${CFG_CHIP_TYPE}" #configure_attr+=" --cpu=cortex-a7 --arch=armv7-a --cross-prefix=${CFG_SDK_TOOLCHAIN} " fi @@ -105,10 +97,9 @@ echo "hi3518ev300 =? ${CFG_CHIP_TYPE}" configure_attr+=" --cpu=cortex-a7 --arch=armv7-a --cross-prefix=${CFG_SDK_TOOLCHAIN} " fi -echo "###################################" echo ${configure_attr} echo ${CFG_SDK_TOOLCHAIN} -echo "###################################" + export http_proxy="" export https_proxy="" export no_proxy="" diff --git a/middleware/source/ffmpeg_adapt/library.mak b/middleware/source/ffmpeg_adapt/library.mak index 8f77a6553ef73085e3729ff68b3c6ca9fd90c74e..6c15f6c78c9c49a92e3cbe0d54b90cc5bf7adf96 100755 --- a/middleware/source/ffmpeg_adapt/library.mak +++ b/middleware/source/ffmpeg_adapt/library.mak @@ -34,9 +34,6 @@ $(TESTPROGS): THISLIB = $(SUBDIR)$(LIBNAME) $(LIBOBJS): CPPFLAGS += -DBUILDING_$(NAME) $(TESTPROGS) $(TOOLS): %$(EXESUF): %.o - echo "###########################################" - echo "##### $$(LD) $(LDFLAGS) $(LDEXEFLAGS) $$(LD_O) $$(filter %.o,$$^) $$(THISLIB) $(FFEXTRALIBS) $$(EXTRALIBS-$$(*F)) $$(ELIBS)" - echo "###########################################" $$(LD) $(LDFLAGS) $(LDEXEFLAGS) $$(LD_O) $$(filter %.o,$$^) $$(THISLIB) $(FFEXTRALIBS) $$(EXTRALIBS-$$(*F)) $$(ELIBS) $(SUBDIR)lib$(NAME).version: $(SUBDIR)version.h | $(SUBDIR) @@ -52,9 +49,6 @@ $(SUBDIR)$(SLIBNAME): $(SUBDIR)$(SLIBNAME_WITH_MAJOR): $(OBJS) $(SLIBOBJS) $(SUBDIR)lib$(NAME).ver $(SLIB_CREATE_DEF_CMD) - echo "###########################################" - echo "########### $$(LD) $(SHFLAGS) $(LDFLAGS) $(LDSOFLAGS) $$(LD_O) $$(filter %.o,$$^) $(FFEXTRALIBS)" - echo "###########################################" $$(LD) $(SHFLAGS) $(LDFLAGS) $(LDSOFLAGS) $$(LD_O) $$(filter %.o,$$^) $(FFEXTRALIBS) $(SLIB_EXTRA_CMD)