From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 47CAB458BB for ; Sat, 25 Feb 2023 01:14:56 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1FCB368C0DF; Sat, 25 Feb 2023 03:14:53 +0200 (EET) Received: from relay2-d.mail.gandi.net (relay2-d.mail.gandi.net [217.70.183.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 311C168BF4B for ; Sat, 25 Feb 2023 03:14:46 +0200 (EET) Received: (Authenticated sender: michael@niedermayer.cc) by mail.gandi.net (Postfix) with ESMTPSA id 4B35540002 for ; Sat, 25 Feb 2023 01:14:45 +0000 (UTC) Date: Sat, 25 Feb 2023 02:14:44 +0100 From: Michael Niedermayer To: FFmpeg development discussions and patches Message-ID: <20230225011444.GY1949656@pb2> MIME-Version: 1.0 Subject: [FFmpeg-devel] videolan ffmpeg git issue [please dont push before reading] X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Content-Type: multipart/mixed; boundary="===============8611779824425392154==" Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: --===============8611779824425392154== Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="tnZn8PcLPqzD5rsa" Content-Disposition: inline --tnZn8PcLPqzD5rsa Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hi all it seems videolan had a double RAID failure and was restored from backup that caused ffmpeg developer git for master and release/5.1 to rewind by a few commits. It would be slightly messy if different commits are pushed on that rewond HEADs- So if you push something (when its possible again) please make sure that teh commits match the previous (pre restore) ones Its not the end of the world if others are pushed, we would then need a merge commit to reconcile these 2 histories thx --=20 Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB In fact, the RIAA has been known to suggest that students drop out of college or go to community college in order to be able to afford settlements. -- The RIAA --tnZn8PcLPqzD5rsa Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iF0EABEIAB0WIQSf8hKLFH72cwut8TNhHseHBAsPqwUCY/lg+QAKCRBhHseHBAsP q3aYAJ4qqIZlfi9sK3yIWRxH5f2uq38dvACfcOrl7APQK3zOqrrJ6s9dSu4PQCk= =x+ll -----END PGP SIGNATURE----- --tnZn8PcLPqzD5rsa-- --===============8611779824425392154== 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". --===============8611779824425392154==--