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 BE6674823E for ; Thu, 14 Dec 2023 19:53:27 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7B18968D29B; Thu, 14 Dec 2023 21:53:24 +0200 (EET) Received: from mail-pl1-f179.google.com (mail-pl1-f179.google.com [209.85.214.179]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9941668D04F for ; Thu, 14 Dec 2023 21:53:18 +0200 (EET) Received: by mail-pl1-f179.google.com with SMTP id d9443c01a7336-1d347b4d676so26636155ad.2 for ; Thu, 14 Dec 2023 11:53:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1702583596; x=1703188396; darn=ffmpeg.org; h=content-transfer-encoding:in-reply-to:autocrypt:from :content-language:references:to:subject:user-agent:mime-version:date :message-id:from:to:cc:subject:date:message-id:reply-to; bh=C48fS3RkjrT06KlyGZVZ+hPW7VFUF1whHYMQ2prlpFk=; b=VAoyZ2WtJ+bWsaOhW3Yyk9I9mDshswPubM0o1mBSVOd7qVf8E19OeTUU6WwLU0H5OF VLKDgUUSHq5YwkXXFFMPUMPeGkRfUr2/hLhvLyJBcsKG3WZkU+4L0lhxJTh3X+PZsJkh l8MRjLQ2jd3WuAXd21wQQwzxsI16VCVtF5EWreWO9VoAu3YSB/pw8BJcxPNpNGgoI7RZ KMD5opJOjX2N13VE+sF2in1psh3KVCiGrNx8TbP85s7OGrz4pv02EXNMfhr8k7OlBVEt WhcQOF7szPvQDqR56dqsuXGKnayqdvu0yIq7ZLLnbyx+Wck3mJbISmPibQr+lyz2Ci2B Oqfw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702583596; x=1703188396; h=content-transfer-encoding:in-reply-to:autocrypt:from :content-language:references:to:subject:user-agent:mime-version:date :message-id:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=C48fS3RkjrT06KlyGZVZ+hPW7VFUF1whHYMQ2prlpFk=; b=KeLGW1bDTafxbf2uGCJ+L3EqDisdQA3CY4PNdphxJ8s5xXUbc26Qlz0J+IzBoqiaMx uVlCk2CegXwngeYhBztqxzvI08n0PLhN7Me0mMRFnGBNcy6bh57vd2P/u1iYbRtssQei sLqyuiQYG7HDYW6KxGKLEihU3YC/JdDoiZr8uKMS8ynDvXZY6KPBMvIYQKEUyA68gJ1Q Ye/zP8rVcwTeRQ0szMhuHtKOdymkqU6VcD0k3q/3dFLmdwDjcjbbGdmdxJYd4WXI5Axc qUvEKnrUsCD/NTYDxVFebcGeeUvuWw2/+BEQ37vBbTgGG4EJgbhS32FJFmAgp3TPi3tZ 960w== X-Gm-Message-State: AOJu0Yw/uk0Iv9tvRB+DbTZdl4laWsP5dxNk6Bqe/6YxnDdQRaWQ2oJF R3F0tlT9DQ1jaBHD/HBi/mswKXdeWTI= X-Google-Smtp-Source: AGHT+IE3ReFw0WyixUj+ClJmbEd4qipHLvUwkdEC0Iw4KEIp7xv6dmQ5TCDnPbsRTwC6wRP971OFNw== X-Received: by 2002:a17:903:41cf:b0:1d0:9661:1618 with SMTP id u15-20020a17090341cf00b001d096611618mr12611766ple.105.1702583596469; Thu, 14 Dec 2023 11:53:16 -0800 (PST) Received: from [192.168.0.13] (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id c3-20020a170902848300b001d33e6521b9sm5319177plo.14.2023.12.14.11.53.15 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 14 Dec 2023 11:53:15 -0800 (PST) Message-ID: <05eb3596-4a18-4211-bc4c-b92155baf3f6@gmail.com> Date: Thu, 14 Dec 2023 16:53:19 -0300 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird To: ffmpeg-devel@ffmpeg.org References: <20231213193007.17471-1-anton@khirnov.net> <20231213193007.17471-3-anton@khirnov.net> <20231214192001.GM6420@pb2> <170258248568.8914.13730217261348596621@lain.khirnov.net> Content-Language: en-US From: James Almer Autocrypt: addr=jamrial@gmail.com; keydata= xsBNBFjZtqABCADLW+vdEoZaJZDsIO6geYFTOcn1unsEHefj9zn+3oTHlDFFzO47mzHsSfbK 9JE2xpOJEVnC8FAF5Sayi/pVwV+mtQUV3n5dgVeVBYF9GUQwOGFCpK8X54RRqhkgknbunOEE 0CtgAJgmpFmmmHgq02GvEspx1h/rh4apqwQR6QX4Favb+x9+i9ytVpwVcBX94vo2toyP7h/K BWfadQmb8ltgE1kshfg+SQs/H5bTV5Z1DuEASf02ZL/1qYB/sdTgWPLv9XMUHHsRFmMY8TMx wJSkP+Af3AiYQPJYz1B1D4tt98T/NoiVdin10zATakPjV8hXaobuRmxgakkUASXudydDABEB AAHNH0phbWVzIEFsbWVyIDxqYW1yaWFsQGdtYWlsLmNvbT7CwJIEEwEIADwCGwMGCwkIBwMC BhUIAgkKCwQWAgMBAh4BAheAFiEEd1EujP2UoWlX5pp6FGMBrXN2WeAFAmJoLUUCGQEACgkQ FGMBrXN2WeAFVQf9GtGhniRs1PzNUOgJktCnv6j4BbLieaIPYPEFXKDHOgjqQE2zVMYXnoXl Jam928ii902a8OY06r9ywn/R8ApD1/3NY/v64O71CY9scz5XyH2au8wIZ6HwFy3/f7sqjdGD uctY8Qs7rjT7NkoC5lmgMu2v2k03dGtM9AAf5AK5gU+H0EUw7vmKKiXzUqt5kvBuf4CEwXvH AQT1SMJ52rIlDWB7FQFyZeUbOAK2IgY/KNedfK6nsgd/eQVnlofPd2XoddE7kP6iys7jJefw DD3g3rZyDTq7in5dyk5glaNpWZpbHGBs+9SCYLnfQ8XvWqPFOD+gj0plamKANgOvavKTxM7A TQRY2bagAQgA69YtILj8kYxmqPr/M8+MXT7wVoOWVW9lvSmPquCELaDy/NIS7D06VC5EuE/6 JlJXZMTn37NLlyWhzwOgXuXw5w2tyoQQBuvqGiXJijuXwXH7HKdzrc6rpYtAqt5w05hzNrFS KrS0izG64VpWrfproy3BsL+8TBm9brLhhNPynVRqVukbbGzlATTzNQGZ14TTi2/dL6DkMQnM qn4jX9UEe4GdGQBP50bUJSSmeiIkyNLWA+znuN2PZEz930ZwNrF9GtDVw7mzcmpCZ7spldE2 tutbpy9D1bIqxyqBrYDSezyzL2adR1qgHyOTMCHg2AYNkrIQHrSyJxKTpZ1/hqOp8wARAQAB wsBfBBgBAgAJBQJY2bagAhsMAAoJEBRjAa1zdlnghekH/0Yb0iYJ74oID2f/Fj+AJKS2ekQF P2xOr8lpGzgp/+yWUvPtqbX0A33anBJdYwxaAC0NataX3tfZ+oJkzXqfmqhIHMPYHdZesJA2 Bk9hU/33mDl5s5U66/z0uelWzwKVHoQ2O6or4+qF3HJFSJLCe9uvWJ3zXf9F342Ftj73sfx+ 3xkw/IXsN1RqbYqDlzpoEQ99SIEfY/8Jjwnd3sIPfqkuyeaYfe6GJDqKawdCEP1oRRlbXEAp TJgYz8r3nPhGv9cdHNDCk44ISbsqVuxIEnLqi4fTPZaGupiQhT+srl268TTAp2TQW7+6Ce/b NPQorMquzS/LZoyALpmsYi/miMc= In-Reply-To: <170258248568.8914.13730217261348596621@lain.khirnov.net> 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-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: On 12/14/2023 4:34 PM, Anton Khirnov wrote: > 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. You pushed four patches that also touched the CLI some hours ago, to fix other reported bugs. They were not in master when you sent this set yesterday. My guess is that on your end a git rebase handled it without conflicts, but git am is in my experience a lot more nitpicky about non matches, hence these not applying. _______________________________________________ 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".