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 5C57047C6D for ; Thu, 14 Dec 2023 19:20:12 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E635D68D264; Thu, 14 Dec 2023 21:20:09 +0200 (EET) Received: from relay1-d.mail.gandi.net (relay1-d.mail.gandi.net [217.70.183.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0C3B268CFA6 for ; Thu, 14 Dec 2023 21:20:03 +0200 (EET) Received: by mail.gandi.net (Postfix) with ESMTPSA id 6F33B240007 for ; Thu, 14 Dec 2023 19:20:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1702581602; 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=RJ68MqcBUUBy/SGGQvD5mztsFxh/ohmlYjquF9QENmc=; b=ZFKLEI+zvNz4PNRoCgmdmbcj8NBJ8X52PUzhlJysvD4LMAakH9WF8+oheKDGRi17rr/aP7 vD2SVBuxuswzjnYoETdjkM7R2Mm1Xvv0x34PK41ZAX3UqcQs5299ZgpNJ009Gx/a+hj1Y1 uDBnBpw12l8poJHTVbAYAc/bqk6ZJ8v4a5KxGOFQDr8GzAq/xglmBDU2oYxL5GCmORbzi5 oeifrxgTPCa+1jS4GWF7MTiCY5L/DUvn07Fg9YUUcu4KD4Kp/powiZju+kIfxqvIRNEsNG +piDyRfWr1mqjpepkXvLNuPtAgulwD8shoE+LNHEFMHdXqrum+Xn2mX+L8rM0Q== Date: Thu, 14 Dec 2023 20:20:01 +0100 From: Michael Niedermayer To: FFmpeg development discussions and patches Message-ID: <20231214192001.GM6420@pb2> References: <20231213193007.17471-1-anton@khirnov.net> <20231213193007.17471-3-anton@khirnov.net> MIME-Version: 1.0 In-Reply-To: <20231213193007.17471-3-anton@khirnov.net> X-GND-Sasl: michael@niedermayer.cc Subject: Re: [FFmpeg-devel] [PATCH 03/12] fftools/ffmpeg: replace OutputStream.file_index by a pointer 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="===============4028499815175168984==" Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: --===============4028499815175168984== Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="bPrm2PuLP7ysUh6c" Content-Disposition: inline --bPrm2PuLP7ysUh6c Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Wed, Dec 13, 2023 at 08:29:58PM +0100, Anton Khirnov wrote: > Reduces the need to use the output_files global array. > --- > fftools/ffmpeg.c | 12 ++++++------ > fftools/ffmpeg.h | 4 +++- > fftools/ffmpeg_enc.c | 21 +++++++++++---------- > fftools/ffmpeg_filter.c | 22 +++++++++++----------- > fftools/ffmpeg_mux.c | 11 +++++------ > fftools/ffmpeg_mux_init.c | 12 ++++++------ > 6 files changed, 42 insertions(+), 40 deletions(-) git seems to fail to apply this Applying: fftools/ffmpeg: replace OutputStream.file_index by a pointer error: sha1 information is lacking or useless (fftools/ffmpeg.c). error: could not build fake ancestor Patch failed at 0001 fftools/ffmpeg: replace OutputStream.file_index by a p= ointer 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 The real ebay dictionary, page 2 "100% positive feedback" - "All either got their money back or didnt compla= in" "Best seller ever, very honest" - "Seller refunded buyer after failed scam" --bPrm2PuLP7ysUh6c Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iF0EABEIAB0WIQSf8hKLFH72cwut8TNhHseHBAsPqwUCZXtVYQAKCRBhHseHBAsP qz3iAKCM1DZuJPxgGM3jFt9WokP8Xnh4PQCfY1n1wn3E3sQTsgsuK3NUznTkdw0= =jdB+ -----END PGP SIGNATURE----- --bPrm2PuLP7ysUh6c-- --===============4028499815175168984== 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". --===============4028499815175168984==--