From b4130e72cd5a06d3dfd47680af00f4d2c1f6e143 Mon Sep 17 00:00:00 2001 From: Taner Sener Date: Sun, 14 Apr 2024 15:42:09 +0100 Subject: [PATCH] allow saf urls in hls playlists, fixes #894 --- scripts/android/ffmpeg.sh | 4 ++++ scripts/apple/ffmpeg.sh | 1 + scripts/linux/ffmpeg.sh | 1 + 3 files changed, 6 insertions(+) diff --git a/scripts/android/ffmpeg.sh b/scripts/android/ffmpeg.sh index 8b311fd..ead711d 100755 --- a/scripts/android/ffmpeg.sh +++ b/scripts/android/ffmpeg.sh @@ -390,9 +390,11 @@ ulimit -n 2048 1>>"${BASEDIR}"/build.log 2>&1 ########################### CUSTOMIZATIONS ####################### cd "${BASEDIR}" 1>>"${BASEDIR}"/build.log 2>&1 || return 1 +git checkout android/ffmpeg-kit-android-lib/src/main/cpp/fftools_ffmpeg_demux.c 1>>"${BASEDIR}"/build.log 2>&1 git checkout android/ffmpeg-kit-android-lib/src/main/cpp/ffmpegkit.c 1>>"${BASEDIR}"/build.log 2>&1 cd "${BASEDIR}"/src/"${LIB_NAME}" 1>>"${BASEDIR}"/build.log 2>&1 || return 1 git checkout libavformat/file.c 1>>"${BASEDIR}"/build.log 2>&1 +git checkout libavformat/hls.c 1>>"${BASEDIR}"/build.log 2>&1 git checkout libavformat/protocols.c 1>>"${BASEDIR}"/build.log 2>&1 git checkout libavutil 1>>"${BASEDIR}"/build.log 2>&1 @@ -409,6 +411,8 @@ else cat ../../tools/protocols/libavutil_file.c >> libavutil/file.c awk '{gsub(/ff_file_protocol;/,"ff_file_protocol;\nextern const URLProtocol ff_saf_protocol;")}1' libavformat/protocols.c > libavformat/protocols.c.tmp cat libavformat/protocols.c.tmp > libavformat/protocols.c + ${SED_INLINE} "s|av_strstart(proto_name, \"file\", NULL))|av_strstart(proto_name, \"file\", NULL) \|\| av_strstart(proto_name, \"saf\", NULL))|g" libavformat/hls.c 1>>"${BASEDIR}"/build.log 2>&1 + ${SED_INLINE} "s| assert_avoptions|//assert_avoptions|g" "${BASEDIR}"/android/ffmpeg-kit-android-lib/src/main/cpp/fftools_ffmpeg_demux.c 1>>"${BASEDIR}"/build.log 2>&1 echo -e "\nINFO: Enabled custom ffmpeg-kit protocols\n" 1>>"${BASEDIR}"/build.log 2>&1 fi diff --git a/scripts/apple/ffmpeg.sh b/scripts/apple/ffmpeg.sh index 0b3a614..a6e09d1 100755 --- a/scripts/apple/ffmpeg.sh +++ b/scripts/apple/ffmpeg.sh @@ -473,6 +473,7 @@ fi ########################### CUSTOMIZATIONS ####################### git checkout libavformat/file.c 1>>"${BASEDIR}"/build.log 2>&1 +git checkout libavformat/hls.c 1>>"${BASEDIR}"/build.log 2>&1 git checkout libavformat/protocols.c 1>>"${BASEDIR}"/build.log 2>&1 git checkout libavutil 1>>"${BASEDIR}"/build.log 2>&1 diff --git a/scripts/linux/ffmpeg.sh b/scripts/linux/ffmpeg.sh index c313f7b..51ad7b4 100755 --- a/scripts/linux/ffmpeg.sh +++ b/scripts/linux/ffmpeg.sh @@ -349,6 +349,7 @@ ulimit -n 2048 1>>"${BASEDIR}"/build.log 2>&1 ########################### CUSTOMIZATIONS ####################### cd "${BASEDIR}"/src/"${LIB_NAME}" 1>>"${BASEDIR}"/build.log 2>&1 || return 1 git checkout libavformat/file.c 1>>"${BASEDIR}"/build.log 2>&1 +git checkout libavformat/hls.c 1>>"${BASEDIR}"/build.log 2>&1 git checkout libavformat/protocols.c 1>>"${BASEDIR}"/build.log 2>&1 git checkout libavutil 1>>"${BASEDIR}"/build.log 2>&1