also latest ffmpeg is broken

This commit is contained in:
2025-02-21 12:55:44 -06:00
parent 4ce5ccb4c4
commit 9fb29771d4
2 changed files with 10 additions and 3 deletions

View File

@@ -161,7 +161,7 @@ check_for_rebuild() {
fi fi
git config pull.rebase false git config pull.rebase false
git stash && git stash drop 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 }')" LATEST_REMOTE="$(git ls-remote "$(git config --get remote.origin.url)" HEAD | awk '{ print $1 }')"
CURRENT_HEAD="$(git rev-parse HEAD)" CURRENT_HEAD="$(git rev-parse HEAD)"
test "$FORCE_REBUILD" == '1' && return 1 test "$FORCE_REBUILD" == '1' && return 1
@@ -237,7 +237,7 @@ if [[ "$(uname -r)" =~ "WSL" ]] ; then
fi fi
# clone ffmpeg # 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() {
# build mpp # build mpp
@@ -622,6 +622,10 @@ fi
cd "$FFMPEG_DIR/" && check_for_rebuild cd "$FFMPEG_DIR/" && check_for_rebuild
export PKG_CONFIG_PATH="${PREFIX}/lib/pkgconfig:$PKG_CONFIG_PATH" export PKG_CONFIG_PATH="${PREFIX}/lib/pkgconfig:$PKG_CONFIG_PATH"
make clean make clean
# TODO: remove after HEVC decoding is not broken in master
git checkout e20ee9f9aec94f8cea1bf4fd8ed3fb096fb205e5
./configure --enable-libsvtav1 \ ./configure --enable-libsvtav1 \
--prefix="${PREFIX}" \ --prefix="${PREFIX}" \
--enable-libdav1d \ --enable-libdav1d \

View File

@@ -117,7 +117,10 @@ encode() {
echo "export VIDEO_ENCODER=\"$VIDEO_ENCODER\"" >> "$ENCODE_FILE" echo "export VIDEO_ENCODER=\"$VIDEO_ENCODER\"" >> "$ENCODE_FILE"
if [[ "$CROP" == "true" ]]; then 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" echo "export VIDEO_CROP=\"$VIDEO_CROP\"" >> "$ENCODE_FILE"
fi fi