Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc> --- tools/merge-all-source-plugins | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) mode change 100644 => 100755 tools/merge-all-source-plugins
diff --git a/tools/merge-all-source-plugins b/tools/merge-all-source-plugins old mode 100644 new mode 100755 index 20764a07737..05f4fe5e97b --- a/tools/merge-all-source-plugins +++ b/tools/merge-all-source-plugins @@ -1,3 +1,10 @@ #!/bin/sh -git pull --no-rebase --log --stat --commit --no-edit https://github.com/michaelni/FFmpeg.git sourceplugin-libpostproc +merge(){ # $1=repository, $2=refspec + git pull --no-rebase --log --stat --commit --no-edit $1 sourceplugin-$2-$version || \ + git pull --no-rebase --log --stat --commit --no-edit $1 sourceplugin-$2 +} + +version="master" + +merge "https://github.com/michaelni/FFmpeg.git"; "libpostproc" -- 2.49.0 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
