dw/FFmpeg-Builds
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

git switch does not take commits

Browse source
This commit is contained in:
BtbN 2020-09-03 17:02:15 +02:00
parent b87c78bae4
commit d942c3164d
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build.sh
View file

@ -31,7 +31,7 @@ docker run --rm -i -u "$(id -u):$(id -g)" -v $PWD/ffbuild:/ffbuild "$IMAGE" bash
git clone https://git.videolan.org/git/ffmpeg.git ffmpeg git clone https://git.videolan.org/git/ffmpeg.git ffmpeg
cd ffmpeg cd ffmpeg
git switch $GIT_BRANCH git checkout $GIT_BRANCH
./configure --prefix=/ffbuild/prefix \$FFBUILD_TARGET_FLAGS $CONFIGURE --extra-cflags="$CFLAGS" --extra-ldflags="$LDFLAGS" ./configure --prefix=/ffbuild/prefix \$FFBUILD_TARGET_FLAGS $CONFIGURE --extra-cflags="$CFLAGS" --extra-ldflags="$LDFLAGS"
make -j\$(nproc) make -j\$(nproc)

2
scripts.d/50-x264.sh
View file

@ -16,7 +16,7 @@ ffbuild_dockerstage() {
ffbuild_dockerbuild() { ffbuild_dockerbuild() {
git clone "$X264_REPO" x264 || return -1 git clone "$X264_REPO" x264 || return -1
pushd x264 pushd x264
git switch "$X264_COMMIT" || return -1 git checkout "$X264_COMMIT" || return -1
local myconf=( local myconf=(
--disable-cli --disable-cli