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 045024AE67 for ; Mon, 24 Jun 2024 19:40:27 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6ECFB68D454; Mon, 24 Jun 2024 22:40:23 +0300 (EEST) 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 BBFB568CC1D for ; Mon, 24 Jun 2024 22:40:16 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id E579C1C0004 for ; Mon, 24 Jun 2024 19:40:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1719258016; 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=LF6H3VWD/i0lNVSOhxxz5IaJbZmJZ/dvDkTwDnQAYGg=; b=Epj8ClIPmivEoppZ5CQlMXvkxyK3FR2JL4cb+WHsYQYMoXZb1nJgO9M6D6FdCrCkE9YnTA 4yLeBbUjXs3GscHmwYDZaJm9OTfbvgHQXnLPAMIJu/XLLuvp7EaRkYM9tXdVgP0nm8+LQ4 h2x5shiILAPPeJwdFdX4vav+HUm8uu3Al/2dtylQne9rjDMK4hugZxeaEgYHQMYMe4XK21 YgSL2bdwCWCJKcX9Sqm24LAFOiWBYiB2IqE+b7O8ESN9glWq0GUkWefea7EhXZBWbN0e+0 eQHL0SbmH9VB7UMtzu3xr4A/Ug2kWGmHOcelrLhjR4QqEEAKUQms0urPFlDCrw== Date: Mon, 24 Jun 2024 21:40:14 +0200 From: Michael Niedermayer To: FFmpeg development discussions and patches Message-ID: <20240624194014.GC4991@pb2> References: <20240622012531.5523-1-jamrial@gmail.com> <20240622012531.5523-2-jamrial@gmail.com> <20240622212515.GY4991@pb2> MIME-Version: 1.0 In-Reply-To: X-GND-Sasl: michael@niedermayer.cc Subject: Re: [FFmpeg-devel] [PATCH 2/2] avformat/mov: default to Monoscopic view when parsing eyes box 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="===============6771821721816733969==" Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: --===============6771821721816733969== Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="G5yIW5EaChZ5gJdA" Content-Disposition: inline --G5yIW5EaChZ5gJdA Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Sat, Jun 22, 2024 at 06:34:49PM -0300, James Almer wrote: > On 6/22/2024 6:25 PM, Michael Niedermayer wrote: > > On Fri, Jun 21, 2024 at 10:25:31PM -0300, James Almer wrote: > > > Signed-off-by: James Almer > > > --- > > > libavformat/mov.c | 2 +- > > > 1 file changed, 1 insertion(+), 1 deletion(-) > >=20 > > doesnt apply automatically with "git am" with the v2 > >=20 > > Applying: avformat/mov: default to Monoscopic view when parsing eyes box > > error: sha1 information is lacking or useless (libavformat/mov.c). > > error: could not build fake ancestor > > Patch failed at 0001 avformat/mov: default to Monoscopic view when pars= ing eyes box > >=20 > > it applies with patch but inability to automatically apply patches > > could affect tools which try to test patches posted > >=20 > > git am --show-current-patch=3Ddiff | patch -p1 > > patching file libavformat/mov.c > > Hunk #1 succeeded at 6546 with fuzz 2. >=20 > Are you sure your tree is clean and up to date? There's no reason for this > patch to not apply, standalone or after 1/1 v1 or v2. the patch says this: index 50e171c960..4fa39cf4fd 100644 git fetch origin git fetch jamrial git show 50e171c960 fatal: ambiguous argument '50e171c960': unknown revision or path not in the= working tree. Use '--' to separate paths from revisions, like this: 'git [...] -- [...]' git show 4fa39cf4fd fatal: ambiguous argument '4fa39cf4fd': unknown revision or path not in the= working tree. Use '--' to separate paths from revisions, like this: 'git [...] -- [...]' so i think the blob this patch was based on is not in any repository known = to my git It might be able to apply the patch anyway but not having the full file thi= s patch is based on makes it harder for git. I did have other patches applied. so git would try to merge this in and if needed produce conflict markers but given that it doesnt seem to have the file this was based on it freaked out thx [...] --=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 --G5yIW5EaChZ5gJdA Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iF0EABEKAB0WIQSf8hKLFH72cwut8TNhHseHBAsPqwUCZnnLegAKCRBhHseHBAsP q0L4AKCMkH4zwEedakPO42jbnk1tM4m8pQCfVcnDye3evz6KV1PnbIwLu+ruxr8= =u99Q -----END PGP SIGNATURE----- --G5yIW5EaChZ5gJdA-- --===============6771821721816733969== 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". --===============6771821721816733969==--