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 A40594878C for ; Wed, 17 Jan 2024 13:02:00 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4EF4768CF3E; Wed, 17 Jan 2024 15:01:57 +0200 (EET) Received: from relay6-d.mail.gandi.net (relay6-d.mail.gandi.net [217.70.183.198]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C7A2568C58B for ; Wed, 17 Jan 2024 15:01:50 +0200 (EET) Received: by mail.gandi.net (Postfix) with ESMTPSA id EDAACC000C for ; Wed, 17 Jan 2024 13:01:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1705496510; 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=P+7ykrqvH2UwGtaeHUSS7GFmIY90eT1De6ghhsdhJcs=; b=jAMk1ttk0ix92RQt3/CGh0DL8EV1S2+Nh1OV0t7fUOp8ERDtBWG+NQHUOB9sYblHzp1481 lJP7biWLCCHEequYjdI49f/f/CUINOroWAKL0msNM9pS0yQJLjdbTVW9LgmF2U84N3kugg ZaRuzMEjq+Qize/Gele0KdWaLWDIJnfbvIrPBmiIA1/dRdKYL+cB0AMvugZuhlqS4rUPR1 6fJFwPBATUyvo0p1WQbbSC0y71gRpIguEWNKBU6nHBVqiL5PKQzPQ8Aq7k4jqgTidKcnUt xtSu/R9IrUPIJ0L6SP9WIPS/6qcEPHEyQPB3YjxW9BDgHLzHCr/tKSkxKlFHTg== Date: Wed, 17 Jan 2024 14:01:49 +0100 From: Michael Niedermayer To: FFmpeg development discussions and patches Message-ID: <20240117130149.GN6420@pb2> References: <20240117124036.7877-1-anton@khirnov.net> <20240117124036.7877-2-anton@khirnov.net> MIME-Version: 1.0 In-Reply-To: <20240117124036.7877-2-anton@khirnov.net> X-GND-Sasl: michael@niedermayer.cc Subject: Re: [FFmpeg-devel] [PATCH 2/8] fftools/cmdutils: add a flag for per-stream options 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="===============6764097240540655750==" Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: --===============6764097240540655750== Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="I5YCbvpNv/EFZQbK" Content-Disposition: inline --I5YCbvpNv/EFZQbK Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Wed, Jan 17, 2024 at 01:40:29PM +0100, Anton Khirnov wrote: > Not all OPT_SPEC options are per-stream, this will allow identifying > those that are, which will be useful in following commits. > --- > fftools/cmdutils.h | 13 +++-- > fftools/ffmpeg_opt.c | 118 +++++++++++++++++++++---------------------- > 2 files changed, 68 insertions(+), 63 deletions(-) Seems git doesnt like applying this Applying: fftools/cmdutils: add a flag for per-stream options error: sha1 information is lacking or useless (fftools/cmdutils.h). error: could not build fake ancestor Patch failed at 0001 fftools/cmdutils: add a flag for per-stream options Use 'git am --show-current-patch' to see the failed patch When you have resolved this problem, run "git am --continue". If you prefer to skip this patch, run "git am --skip" instead. To restore the original branch and stop patching, run "git am --abort". [...] --=20 Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB Never trust a computer, one day, it may think you are the virus. -- Compn --I5YCbvpNv/EFZQbK Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iF0EABEIAB0WIQSf8hKLFH72cwut8TNhHseHBAsPqwUCZafPuQAKCRBhHseHBAsP q7hhAKCHAas6YuBVdK8r9oYh1cSgsgzW8wCeKROxs3cq3eHb1GYMIB6kRYzanCY= =y8U+ -----END PGP SIGNATURE----- --I5YCbvpNv/EFZQbK-- --===============6764097240540655750== 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". --===============6764097240540655750==--