From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <ffmpeg-devel-bounces@ffmpeg.org> Received: from ffbox0-bg.ffmpeg.org (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTPS id D4EC64F997 for <ffmpegdev@gitmailbox.com>; Mon, 23 Jun 2025 21:44:06 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id 413EE68D617; Tue, 24 Jun 2025 00:44:00 +0300 (EEST) Received: from mail-wr1-f47.google.com (mail-wr1-f47.google.com [209.85.221.47]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id A7E80687DB6 for <ffmpeg-devel@ffmpeg.org>; Tue, 24 Jun 2025 00:40:36 +0300 (EEST) Received: by mail-wr1-f47.google.com with SMTP id ffacd0b85a97d-3a582e09144so2817669f8f.1 for <ffmpeg-devel@ffmpeg.org>; Mon, 23 Jun 2025 14:40:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1750714835; x=1751319635; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=oKgwy0xbORFOjWP9gYEQT2C5BrsrH9TOIJ7nHUW5XOc=; b=frl0XCtxGTpCZ7vKeqpQrPJ+Ay5PdCstP9iqh8mi/7yI3/KKhTlz4l0kf7DrwpJEfX 91kdfEF6HQqvShTXKRK9gtW3pp9pFKfH66wZevZG4a0lWH9U9DJbrl88tYUjo/hVoeAe P1RUF8QbT/3utIDJcMwh82K2Bg5yEjn5AmZWbftwD8jgFZUgNt72Rta83KJCdC2UrgZ2 5zD1+HMsvb9bGih9iAckkEoaII2QUUKcCM6PQEowfp2ISJvzvLwyFzyQT81L56qDFRpc uDvCB5rFZZl5snPwczlIYdx8xujBTwMlhzhA4W48GsWtnJXo5WJ18eXN6p+iomqEGQvX V2sA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750714835; x=1751319635; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=oKgwy0xbORFOjWP9gYEQT2C5BrsrH9TOIJ7nHUW5XOc=; b=b+puPPoCrE8ZISmnRyqBQu24XBWPUB9wdn3wWtUvn6SRvxR2Xb0sDwyg3zDFnk4HDp KI17qbyGaxKMbc+8vxzSkFJ02cSAOZd1uah248LVUiSosfbPrVN5MCnoPLke2knXX//r xKc2BSjVEUUyv7xLycmJ3BvWM9+9AkTSM1aLjpoBZwj3y3TWiE2fWRDpmI1oNgotw0v0 6ygDycyaE/rHIaBtOA407nXul3nuqN9cKtWPA7qE8CBFyhviyffUQxKy+21K3UVea7EN 9XkuCqiZ5o/BP6zCW3W8C0X0Nuchvc9YGejDAYVzXduvkbWJgqQwxpbdREV/ZpdS3lrQ dOWQ== X-Gm-Message-State: AOJu0YyR0S5O1MXSBx1IiDstkjSWzu0jy34Zmas0srlybG0vL68W3eS3 1eDHLrt96DiHnzHM9RX1jv8qG/WAYFSupRjAIgOsEaC3RhE0RIUr5mps5VblZ2DZ X-Gm-Gg: ASbGnctWF+zo8esGQTPorditpfHrTw6h4M8vnlPV4lVc8VqXKqQ+GF2Rd8jPqTrocCA mFiRcRKCoHO2V6FejW2/SPLWdo4lYOj9uW6ZdisFvH/GX8dHib/MojWi5QH3BX0Wg6SNJaQPy5N hMdJHUiD9G80G+LA3ZPT/sZEPY2I5yWn+/8bTqV/2Ic9DmvH5RKAMP5/HCFI/PofZweeOtpoiau Ee/4t1RXlPE20I9FdmImzNosstCzGXqGyt+nyY3V+htWR32YqdML8tbJg24bd4LWvKjOlhfnKhg QMyC9ClDMNikgRAIj4TK2frSiDwxH2TjIOgWPkU34GizAorzIOVt+9mDu9SiUwoVBphg0OdATNp 8KTA3mqgTGSY0HidPywnZHYquLjT+oQ4= X-Google-Smtp-Source: AGHT+IGh7TO7sCjn3fUdjFBE7huinVjzYPQ9muneiyDpSS0d0ELy6MEQUY5dQ8fV4JRXK3F0mm+IUg== X-Received: by 2002:a05:6000:4b0d:b0:3a6:d579:ec21 with SMTP id ffacd0b85a97d-3a6d579eca1mr8943029f8f.12.1750714834854; Mon, 23 Jun 2025 14:40:34 -0700 (PDT) Received: from localhost.localdomain (33bf1e4c.skybroadband.com. [51.191.30.76]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3a6e80f296bsm170881f8f.60.2025.06.23.14.40.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Jun 2025 14:40:34 -0700 (PDT) From: Derek Buitenhuis <derek.buitenhuis-at-gmail.com@ffmpeg.org> To: ffmpeg-devel@ffmpeg.org Date: Mon, 23 Jun 2025 22:40:20 +0100 Message-ID: <20250623214020.46427-1-derek.buitenhuis@gmail.com> X-Mailer: git-send-email 2.49.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] tools: Remove libav-merge-next-commit X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches <ffmpeg-devel.ffmpeg.org> List-Unsubscribe: <https://ffmpeg.org/mailman/options/ffmpeg-devel>, <mailto:ffmpeg-devel-request@ffmpeg.org?subject=unsubscribe> List-Archive: <https://ffmpeg.org/pipermail/ffmpeg-devel> List-Post: <mailto:ffmpeg-devel@ffmpeg.org> List-Help: <mailto:ffmpeg-devel-request@ffmpeg.org?subject=help> List-Subscribe: <https://ffmpeg.org/mailman/listinfo/ffmpeg-devel>, <mailto:ffmpeg-devel-request@ffmpeg.org?subject=subscribe> Reply-To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" <ffmpeg-devel-bounces@ffmpeg.org> Archived-At: <https://master.gitmailbox.com/ffmpegdev/20250623214020.46427-1-derek.buitenhuis@gmail.com/> List-Archive: <https://master.gitmailbox.com/ffmpegdev/> List-Post: <mailto:ffmpegdev@gitmailbox.com> Libav is no longer extant. Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com> --- tools/libav-merge-next-commit | 22 ---------------------- 1 file changed, 22 deletions(-) delete mode 100755 tools/libav-merge-next-commit diff --git a/tools/libav-merge-next-commit b/tools/libav-merge-next-commit deleted file mode 100755 index 9bd03fabf8..0000000000 --- a/tools/libav-merge-next-commit +++ /dev/null @@ -1,22 +0,0 @@ -#!/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 -- 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-request@ffmpeg.org with subject "unsubscribe".