gx
dcecd42de4
Snapshot FFmpeg n7.1 (release tag) с применённым patch'ем для cuframes input format. Используется как FFMPEG_REPO_OVERRIDE в NickM-27/FFmpeg-Builds fork для статической сборки patched binary под Frigate (Debian 12 / glibc 2.36). Apply changes: + libavformat/cuframesdec.c (новый — реализация демуксера) M libavformat/Makefile (CONFIG_CUFRAMES_DEMUXER target) M libavformat/allformats.c (extern declaration) M configure (--enable-libcuframes option + dep check) Patch source: https://git.goldix.org/gx/cuframes (filter/ffmpeg-7.1-cuframes-demuxer.patch) History сброшена (snapshot вместо fork) потому что upstream shallow clone не позволял push в gitea. Полная история FFmpeg — на github.com/FFmpeg/FFmpeg n7.1.
23 lines
637 B
Bash
Executable File
23 lines
637 B
Bash
Executable File
#!/bin/sh
|
|
|
|
if [ "$1" != "merge" -a "$1" != "noop" ]; then
|
|
printf "Usage: $0 <merge|noop [REF_HASH]>\n"
|
|
exit 0
|
|
fi
|
|
|
|
[ "$1" = "noop" ] && merge_opts="-s ours"
|
|
|
|
nextrev=$(git rev-list libav/master --not master --no-merges | tail -n1)
|
|
if [ -z "$nextrev" ]; then
|
|
printf "Nothing to merge..\n"
|
|
exit 0
|
|
fi
|
|
printf "Merging $(git log -n 1 --oneline $nextrev)\n"
|
|
git merge --no-commit $merge_opts --no-ff --log $nextrev
|
|
|
|
if [ "$1" = "noop" -a -n "$2" ]; then
|
|
printf "\nThis commit is a noop, see $2\n" >> .git/MERGE_MSG
|
|
fi
|
|
|
|
printf "\nMerged-by: $(git config --get user.name) <$(git config --get user.email)>\n" >> .git/MERGE_MSG
|