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 EE69048232 for ; Thu, 14 Dec 2023 19:34:53 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 640B268D2A5; Thu, 14 Dec 2023 21:34:52 +0200 (EET) Received: from mail0.khirnov.net (red.khirnov.net [176.97.15.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5BF6A68CDE9 for ; Thu, 14 Dec 2023 21:34:46 +0200 (EET) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id 291142405ED for ; Thu, 14 Dec 2023 20:34:46 +0100 (CET) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavis, port 10024) with ESMTP id NVeYcLPlSwwY for ; Thu, 14 Dec 2023 20:34:45 +0100 (CET) Received: from lain.khirnov.net (lain.khirnov.net [IPv6:2001:67c:1138:4306::3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "lain.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail0.khirnov.net (Postfix) with ESMTPS id C307E2400AC for ; Thu, 14 Dec 2023 20:34:45 +0100 (CET) Received: by lain.khirnov.net (Postfix, from userid 1000) id ADB891601B9; Thu, 14 Dec 2023 20:34:45 +0100 (CET) From: Anton Khirnov To: FFmpeg development discussions and patches In-Reply-To: <20231214192001.GM6420@pb2> References: <20231213193007.17471-1-anton@khirnov.net> <20231213193007.17471-3-anton@khirnov.net> <20231214192001.GM6420@pb2> Mail-Followup-To: FFmpeg development discussions and patches Date: Thu, 14 Dec 2023 20:34:45 +0100 Message-ID: <170258248568.8914.13730217261348596621@lain.khirnov.net> User-Agent: alot/0.8.1 MIME-Version: 1.0 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: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: Quoting Michael Niedermayer (2023-12-14 20:20:01) > 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 pointer > 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". Oh sorry, only saw this email after pushing the patches (didn't want to wait long, because they are quite simple and fix reported issues). No idea why is it failing to apply, the branch should have been based on master. -- Anton Khirnov _______________________________________________ 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".