From 9fb29771d4f38f50550303a906581faa124d61ef Mon Sep 17 00:00:00 2001 From: Levon Gevorgyan Date: Fri, 21 Feb 2025 12:55:44 -0600 Subject: [PATCH] also latest ffmpeg is broken --- scripts/build.sh | 8 ++++++-- scripts/recc_encode.sh | 5 ++++- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/scripts/build.sh b/scripts/build.sh index 7dddc9e..baeb68d 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -161,7 +161,7 @@ check_for_rebuild() { fi git config pull.rebase false git stash && git stash drop - git pull || exit 1 + git pull || return 1 LATEST_REMOTE="$(git ls-remote "$(git config --get remote.origin.url)" HEAD | awk '{ print $1 }')" CURRENT_HEAD="$(git rev-parse HEAD)" test "$FORCE_REBUILD" == '1' && return 1 @@ -237,7 +237,7 @@ if [[ "$(uname -r)" =~ "WSL" ]] ; then fi # clone ffmpeg -git clone --depth "$GIT_DEPTH" https://github.com/FFmpeg/FFmpeg "$FFMPEG_DIR" +git clone https://github.com/FFmpeg/FFmpeg "$FFMPEG_DIR" build_mpp() { # build mpp @@ -622,6 +622,10 @@ fi cd "$FFMPEG_DIR/" && check_for_rebuild export PKG_CONFIG_PATH="${PREFIX}/lib/pkgconfig:$PKG_CONFIG_PATH" make clean + +# TODO: remove after HEVC decoding is not broken in master +git checkout e20ee9f9aec94f8cea1bf4fd8ed3fb096fb205e5 + ./configure --enable-libsvtav1 \ --prefix="${PREFIX}" \ --enable-libdav1d \ diff --git a/scripts/recc_encode.sh b/scripts/recc_encode.sh index 748f9ac..63cd3b7 100755 --- a/scripts/recc_encode.sh +++ b/scripts/recc_encode.sh @@ -117,7 +117,10 @@ encode() { echo "export VIDEO_ENCODER=\"$VIDEO_ENCODER\"" >> "$ENCODE_FILE" if [[ "$CROP" == "true" ]]; then - VIDEO_CROP="-vf \"$(get_crop)\"" + CROP_VALUE="$(get_crop)" + # crop needs to be defined + test "$CROP_VALUE" == '' && { echo 'Failed to get crop' ; exit 1 ; } + VIDEO_CROP="-vf \"$CROP_VALUE\"" echo "export VIDEO_CROP=\"$VIDEO_CROP\"" >> "$ENCODE_FILE" fi