diff --git a/trunk/auto/depends.sh b/trunk/auto/depends.sh index ba1973ebaf..8958240035 100755 --- a/trunk/auto/depends.sh +++ b/trunk/auto/depends.sh @@ -650,7 +650,7 @@ if [[ $SRS_FFMPEG_FIT == YES ]]; then fi # Disable features of ffmpeg. FFMPEG_OPTIONS="$FFMPEG_OPTIONS --disable-avdevice --disable-avformat --disable-swscale --disable-postproc --disable-avfilter --disable-network" - FFMPEG_OPTIONS="$FFMPEG_OPTIONS --disable-dwt --disable-error-resilience --disable-lsp --disable-lzo --disable-faan --disable-pixelutils" + FFMPEG_OPTIONS="$FFMPEG_OPTIONS --disable-dwt --disable-error-resilience --disable-lsp --disable-faan --disable-pixelutils" FFMPEG_OPTIONS="$FFMPEG_OPTIONS --disable-hwaccels --disable-devices --disable-audiotoolbox --disable-videotoolbox --disable-cuvid" FFMPEG_OPTIONS="$FFMPEG_OPTIONS --disable-d3d11va --disable-dxva2 --disable-ffnvcodec --disable-nvdec --disable-nvenc --disable-v4l2-m2m --disable-vaapi" FFMPEG_OPTIONS="$FFMPEG_OPTIONS --disable-vdpau --disable-appkit --disable-coreimage --disable-avfoundation --disable-securetransport --disable-iconv" diff --git a/trunk/configure b/trunk/configure index 0af21a8615..3526b899fb 100755 --- a/trunk/configure +++ b/trunk/configure @@ -555,7 +555,7 @@ help: @echo " uninstall Uninstall srs from prefix path" @echo "To rebuild special module:" @echo " st Rebuild st-srs in ${SRS_OBJS}/${SRS_PLATFORM}/st-srs" - @echo " ffmpeg Rebuild ffmpeg in ${SRS_OBJS}/${SRS_PLATFORM}/ffmpeg-4.2-fit" + @echo " ffmpeg Rebuild ffmpeg in ${SRS_OBJS}/${SRS_PLATFORM}/ffmpeg-5-fit" @echo "To reconfigure special depends:" @echo " clean_openssl Remove the openssl cache." @echo " clean_srtp2 Remove the libsrtp2 cache." @@ -610,8 +610,8 @@ st: ffmpeg: @rm -f ${SRS_OBJS}/srs srs_utest - \$(MAKE)\$(JOBS) -C ${SRS_OBJS}/${SRS_PLATFORM}/ffmpeg-4.2-fit - \$(MAKE)\$(JOBS) -C ${SRS_OBJS}/${SRS_PLATFORM}/ffmpeg-4.2-fit install-libs + \$(MAKE)\$(JOBS) -C ${SRS_OBJS}/${SRS_PLATFORM}/ffmpeg-5-fit + \$(MAKE)\$(JOBS) -C ${SRS_OBJS}/${SRS_PLATFORM}/ffmpeg-5-fit install-libs @echo "Please rebuild srs by: make" END