From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <ffmpeg-devel-bounces@ffmpeg.org> Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTPS id 131844E7EE for <ffmpegdev@gitmailbox.com>; Mon, 17 Mar 2025 00:27:50 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7F29E68D490; Mon, 17 Mar 2025 02:27:46 +0200 (EET) Received: from relay5-d.mail.gandi.net (relay5-d.mail.gandi.net [217.70.183.197]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E6A9D687C2B for <ffmpeg-devel@ffmpeg.org>; Mon, 17 Mar 2025 02:27:39 +0200 (EET) Received: by mail.gandi.net (Postfix) with ESMTPSA id 273B04330C for <ffmpeg-devel@ffmpeg.org>; Mon, 17 Mar 2025 00:27:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1742171259; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=ui2vDh1d0pVMfW0GTkSpNSGPJQcY1qR/FvyMoXaNdJY=; b=mtW3jhx48kSNab8YyuOp9D3hEZL37eQT+eRD5LIPExnJJiZrIInn92Q3rW/lNSrai2ifBh ign0NBKeDsu00ED6hNJxGIY1OHfUahA4YG/jv8/PMc+gFbc0f3lH0tarduM8KMNYw7ar8S N7OglL1s7JrdeNVHLOTZIjm+/f31qArnIBl1BU/reN+tJV2uuTVdnuPvuLhHiU/J4diRPV CuMC3cSEsm9OAMdK06+V2QlaOoo1xatgT83L088DxYKectdKW9WKhmGFr81YIJBTBJhsdW Y/Tm50clqy7Bq4bH3pvRn7BF5iUT40kwVUmm5mcUJkj/OUdCIq/AcBnwNF5D3g== Date: Mon, 17 Mar 2025 01:27:38 +0100 From: Michael Niedermayer <michael@niedermayer.cc> To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org> Message-ID: <20250317002738.GZ4991@pb2> References: <20250314143046.4060235-1-michael@niedermayer.cc> MIME-Version: 1.0 In-Reply-To: <20250314143046.4060235-1-michael@niedermayer.cc> X-GND-State: clean X-GND-Score: -70 X-GND-Cause: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgddufeektdehucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuifetpfffkfdpucggtfgfnhhsuhgsshgtrhhisggvnecuuegrihhlohhuthemuceftddunecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenfghrlhcuvffnffculdeftddmnecujfgurhepfffhvffukfhfgggtuggjsehgtderredttddvnecuhfhrohhmpefoihgthhgrvghlucfpihgvuggvrhhmrgihvghruceomhhitghhrggvlhesnhhivgguvghrmhgrhigvrhdrtggtqeenucggtffrrghtthgvrhhnpeeigeektdejudffjefhteegjedtgeettefggedthfejgfevhfetgeekjedtvdfhveenucfkphepgedurdeiiedrieejrdduudefnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepgedurdeiiedrieejrdduudefpdhhvghloheplhhotggrlhhhohhsthdpmhgrihhlfhhrohhmpehmihgthhgrvghlsehnihgvuggvrhhmrgihvghrrdgttgdpnhgspghrtghpthhtohepuddprhgtphhtthhopehffhhmphgvghdquggvvhgvlhesfhhfmhhpvghgrdhorhhg X-GND-Sasl: michael@niedermayer.cc Subject: Re: [FFmpeg-devel] [PATCH] gitattributes: End merge conflicts in Changelog 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: multipart/mixed; boundary="===============5908147106808474232==" Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" <ffmpeg-devel-bounces@ffmpeg.org> Archived-At: <https://master.gitmailbox.com/ffmpegdev/20250317002738.GZ4991@pb2/> List-Archive: <https://master.gitmailbox.com/ffmpegdev/> List-Post: <mailto:ffmpegdev@gitmailbox.com> --===============5908147106808474232== Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="+uDpnwL6kRRcL2Hv" Content-Disposition: inline --+uDpnwL6kRRcL2Hv Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Fri, Mar 14, 2025 at 03:30:46PM +0100, Michael Niedermayer wrote: > Similar could be done with other lists that generally are appended to >=20 > Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> > --- > .gitattributes | 1 + > 1 file changed, 1 insertion(+) will apply [...] --=20 Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB While the State exists there can be no freedom; when there is freedom there will be no State. -- Vladimir Lenin --+uDpnwL6kRRcL2Hv Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iF0EABEKAB0WIQSf8hKLFH72cwut8TNhHseHBAsPqwUCZ9dseQAKCRBhHseHBAsP q0sqAKCDNGmdTnMD3fQzcXEPEqTNpETOvACfc6AzVtZMh4su6VkTlHKF5XcU7gw= =ClDF -----END PGP SIGNATURE----- --+uDpnwL6kRRcL2Hv-- --===============5908147106808474232== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ 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". --===============5908147106808474232==--