Skip to content

Commit 00f0eaf

Browse files
author
Romain Beauxis
committed
Prepare for new mts-libav
1 parent 5cbb672 commit 00f0eaf

5 files changed

Lines changed: 6 additions & 84 deletions

File tree

addins/descript.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
#!/bin/bash
2+
GIT_BRANCH="descript/7.1.2"

build.sh

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ fi
1919
rm -rf ffbuild
2020
mkdir ffbuild
2121

22-
FFMPEG_REPO="${FFMPEG_REPO:-https://github.com/FFmpeg/FFmpeg.git}"
22+
FFMPEG_REPO="${FFMPEG_REPO:-https://github.com/descriptinc/ffmpeg.git}"
2323
FFMPEG_REPO="${FFMPEG_REPO_OVERRIDE:-$FFMPEG_REPO}"
2424
GIT_BRANCH="${GIT_BRANCH:-master}"
2525
GIT_BRANCH="${GIT_BRANCH_OVERRIDE:-$GIT_BRANCH}"
@@ -34,7 +34,6 @@ cat <<EOF >"$BUILD_SCRIPT"
3434
3535
git clone --filter=blob:none --branch='$GIT_BRANCH' '$FFMPEG_REPO' ffmpeg
3636
cd ffmpeg
37-
patch -p1 < /patches/001-ffmpeg-add-force-cfr-flag.patch
3837
3938
./configure --prefix=/ffbuild/prefix --pkg-config-flags="--static" \$FFBUILD_TARGET_FLAGS \$FF_CONFIGURE \
4039
--extra-cflags="\$FF_CFLAGS" --extra-cxxflags="\$FF_CXXFLAGS" --extra-libs="\$FF_LIBS" \
@@ -47,7 +46,7 @@ EOF
4746

4847
[[ -t 1 ]] && TTY_ARG="-t" || TTY_ARG=""
4948

50-
docker run --rm -i $TTY_ARG "${UIDARGS[@]}" -v "$PWD/ffbuild":/ffbuild -v "$BUILD_SCRIPT":/build.sh -v "$PWD/patches/ffmpeg":/patches "$IMAGE" bash /build.sh
49+
docker run --rm -i $TTY_ARG "${UIDARGS[@]}" -v "$PWD/ffbuild":/ffbuild -v "$BUILD_SCRIPT":/build.sh "$IMAGE" bash /build.sh
5150

5251
if [[ -n "$FFBUILD_OUTPUT_DIR" ]]; then
5352
mkdir -p "$FFBUILD_OUTPUT_DIR"

cmd

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
+ ./configure --prefix=/ffbuild/prefix --pkg-config-flags=--static --pkg-config=pkg-config --cross-prefix=x86_64-ffbuild-linux-gnu- --arch=x86_64 --target-os=linux --enable-nonfree --enable-gpl --enable-version3 --disable-debug --enable-iconv --enable-zlib --enable-libxml2 --enable-libsoxr --enable-openssl --enable-libvmaf --enable-fontconfig --enable-libharfbuzz --enable-libfreetype --enable-libfribidi --enable-vulkan --enable-libshaderc --enable-libvorbis --enable-libxcb --enable-xlib --enable-libpulse --enable-gmp --enable-lzma --enable-opencl --enable-amf --enable-libaom --enable-libaribb24 --enable-avisynth --enable-chromaprint --enable-libdav1d --enable-libdavs2 --enable-libdvdread --enable-libdvdnav --enable-libfdk-aac --enable-ffnvcodec --enable-cuda-llvm --enable-frei0r --enable-libgme --enable-libkvazaar --enable-libaribcaption --enable-libass --enable-libbluray --enable-libjxl --enable-libmp3lame --enable-libopus --enable-libplacebo --enable-librist --enable-libssh --enable-libtheora --enable-libvpx --enable-libwebp --enable-libzmq --enable-lv2 --enable-libvpl --enable-openal --enable-libopencore-amrnb --enable-libopencore-amrwb --enable-libopenh264 --enable-libopenjpeg --enable-libopenmpt --enable-librav1e --enable-librubberband --disable-schannel --enable-sdl2 --enable-libsnappy --enable-libsrt --enable-libsvtav1 --enable-libtwolame --enable-libuavs3d --enable-libdrm --enable-vaapi --enable-libvidstab --enable-libvvenc --enable-libx264 --enable-libx265 --enable-libxavs2 --enable-libxvid --enable-libzimg --enable-libzvbi --extra-cflags=-DLIBTWOLAME_STATIC --extra-cxxflags= '--extra-libs=-lgomp -ldl' --extra-ldflags=-pthread --extra-ldexeflags=-pie --cc=x86_64-ffbuild-linux-gnu-gcc --cxx=x86_64-ffbuild-linux-gnu-g++ --ar=x86_64-ffbuild-linux-gnu-gcc-ar --ranlib=x86_64-ffbuild-linux-gnu-gcc-ranlib --nm=x86_64-ffbuild-linux-gnu-gcc-nm --extra-version=20251105

patches/ffmpeg/001-ffmpeg-add-force-cfr-flag.patch

Lines changed: 0 additions & 80 deletions
This file was deleted.

util/vars.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ while [[ "$#" -gt 0 ]]; do
3030
shift
3131
done
3232

33-
REPO="${GITHUB_REPOSITORY:-btbn/ffmpeg-builds}"
33+
REPO="${GITHUB_REPOSITORY:-descriptinc/FFmpeg-builds}"
3434
REPO="${REPO,,}"
3535
REGISTRY="${REGISTRY_OVERRIDE:-ghcr.io}"
3636
BASE_IMAGE="${REGISTRY}/${REPO}/base:latest"

0 commit comments

Comments
 (0)