opensource/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-05-17 15:08:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

tools/merge-all-source-plugins: Try merging a tag or branch matching the current version

Browse Source 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer
2025-05-15 14:53:17 +02:00
parent 12b853530a
commit a06b86a09b
1 changed files with 25 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
tools/merge-all-source-plugins Normal file → Executable file
View File

@ -1,3 +1,27 @@
#!/bin/sh
git pull --no-rebase --log --stat --commit --no-edit https://github.com/michaelni/FFmpeg.git sourceplugin-libpostproc
#If a version is set then we only try merging a source plugin with matching version as a generic one could change the ABI to master HEAD
merge_internal(){ # $1=repository, $2=refspec
[ -n "$version" ] && git pull --no-rebase --log --stat --commit --no-edit $1 sourceplugin-$2-$version
[ -z "$version" ] && git pull --no-rebase --log --stat --commit --no-edit $1 sourceplugin-$2
}
unset suceeded failed version
merge(){ # $1=repository, $2=refspec
merge_internal "$1" "$2" || {
git reset --hard
echo merge of $1 $2 failed, continuing with other plugins
failed="$failed $2"
return 0
}
suceeded="$suceeded $2"
}
#version="12.34"
merge "https://github.com/michaelni/FFmpeg.git" "libpostproc"
[ -n "$version" ] && echo version: $version
[ -n "$suceeded" ] && echo Succeeded merging: $suceeded
[ -n "$failed" ] && echo Failed merging: $failed