From bfae75077e733be859fbf363b473837a8e2187c0 Mon Sep 17 00:00:00 2001 From: winlin Date: Mon, 28 Jun 2021 07:46:13 +0800 Subject: [PATCH] Fix #2431, configure FFmpeg bug. 4.0.135 --- CHANGELOG.md | 1 + trunk/auto/depends.sh | 7 ++++--- trunk/src/core/srs_core_version4.hpp | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0d39d3e6e..a4829cca5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ The changelog for SRS. ## SRS 4.0 Changelog +* v4.0, 2021-06-28, Fix [#2431](https://github.com/ossrs/srs/issues/2431), configure FFmpeg bug. 4.0.135 * v4.0, 2021-06-28, Merge [#2444](https://github.com/ossrs/srs/pull/2444), add libavcodec/crystalhd.c for FFmpeg. 4.0.134 * v4.0, 2021-06-28, Merge [#2438](https://github.com/ossrs/srs/pull/2438), fix losing of last HLS ts file 4.0.133 * v4.0, 2021-06-27, Squash for [#2424](https://github.com/ossrs/srs/issues/2424), query the latest available version. 4.0.132 diff --git a/trunk/auto/depends.sh b/trunk/auto/depends.sh index d17c9795c..6f642f723 100755 --- a/trunk/auto/depends.sh +++ b/trunk/auto/depends.sh @@ -702,15 +702,16 @@ if [[ $SRS_FFMPEG_FIT == YES ]]; then cd ${SRS_OBJS}/${SRS_PLATFORM}/ffmpeg-4-fit && cp -R ../../../3rdparty/ffmpeg-4-fit/* . && # Build source code. $FFMPEG_CONFIGURE \ - --prefix=`pwd`/_release --pkg-config=pkg-config ${FFMPEG_OPTIONS} \ - --disable-everything --pkg-config-flags="--static" --extra-libs="-lpthread" --extra-libs="-lm" \ + --prefix=`pwd`/_release --pkg-config=pkg-config \ + --pkg-config-flags="--static" --extra-libs="-lpthread" --extra-libs="-lm" \ + --disable-everything ${FFMPEG_OPTIONS} \ --disable-programs --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages \ --disable-avdevice --disable-avformat --disable-swscale --disable-postproc --disable-avfilter --disable-network \ --disable-dct --disable-dwt --disable-error-resilience --disable-lsp --disable-lzo --disable-faan --disable-pixelutils \ --disable-hwaccels --disable-devices --disable-audiotoolbox --disable-videotoolbox --disable-cuvid \ --disable-d3d11va --disable-dxva2 --disable-ffnvcodec --disable-nvdec --disable-nvenc --disable-v4l2-m2m --disable-vaapi \ --disable-vdpau --disable-appkit --disable-coreimage --disable-avfoundation --disable-securetransport --disable-iconv \ - --disable-lzma --disable-sdl2 --disable-everything --enable-decoder=aac --enable-decoder=aac_fixed --enable-decoder=aac_latm \ + --disable-lzma --disable-sdl2 --enable-decoder=aac --enable-decoder=aac_fixed --enable-decoder=aac_latm \ --enable-encoder=aac && # See https://www.laoyuyu.me/2019/05/23/android/clang_compile_ffmpeg/ if [[ $SRS_CROSS_BUILD == YES ]]; then diff --git a/trunk/src/core/srs_core_version4.hpp b/trunk/src/core/srs_core_version4.hpp index e8c44672a..7890accec 100644 --- a/trunk/src/core/srs_core_version4.hpp +++ b/trunk/src/core/srs_core_version4.hpp @@ -9,6 +9,6 @@ #define VERSION_MAJOR 4 #define VERSION_MINOR 0 -#define VERSION_REVISION 134 +#define VERSION_REVISION 135 #endif