From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.ffmpeg.org (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTPS id 192AA4FB65 for ; Fri, 27 Jun 2025 21:51:04 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id DF99068DF11; Sat, 28 Jun 2025 00:50:56 +0300 (EEST) Received: from relay2-d.mail.gandi.net (relay2-d.mail.gandi.net [217.70.183.194]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id 571C268DAEA for ; Sat, 28 Jun 2025 00:50:50 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id 9EB5A41B50 for ; Fri, 27 Jun 2025 21:50:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1751061049; 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=A4KUfV0Rc5w3lJxrvm52ZaceZoGIzgm8c2HDhrQLXW8=; b=AcZipcelRF/Bt61OyLbtP3XNFQ6SLYMKm+hMkOjWPQNKr09BLMoH7RyT+Jca8fLXf1Dgxg xLzWCAzxUt2UiPNxmjd0a2B6hTy4eb1dOv2Zt4ms195ZiYcMazBsK5xWfTb4/roA0LDIBT wjfiAvFVdsLfEwNdkHOZYdeAFhFqsSgwM2q5t/bB2e3DFQ7vZlfLmZkwEqAfcA5OYSiue1 I4Z/d7Ej/BqtpG/lVl0cgFw3iVqxLrNWfi7/OKP7y7K+jv7qQM0Lmec5HhCvCAnHiFBcNK k4v+78SAsDKpAnoA63pQfU0vqXAO/jLgPcGkpSG97naGaYHoVzOzdro9nqC+DA== Date: Fri, 27 Jun 2025 23:50:48 +0200 From: Michael Niedermayer To: FFmpeg development discussions and patches Message-ID: <20250627215048.GK29660@pb2> References: <20250624180202.15430-1-epirat07@gmail.com> <20250624180202.15430-2-epirat07@gmail.com> MIME-Version: 1.0 In-Reply-To: <20250624180202.15430-2-epirat07@gmail.com> X-GND-State: clean X-GND-Score: -70 X-GND-Cause: gggruggvucftvghtrhhoucdtuddrgeeffedrtdefgdegudekucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuifetpfffkfdpucggtfgfnhhsuhgsshgtrhhisggvnecuuegrihhlohhuthemuceftddunecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenfghrlhcuvffnffculdeftddmnecujfgurhepfffhvffukfhfgggtuggjsehgtderredttddvnecuhfhrohhmpefoihgthhgrvghlucfpihgvuggvrhhmrgihvghruceomhhitghhrggvlhesnhhivgguvghrmhgrhigvrhdrtggtqeenucggtffrrghtthgvrhhnpeeigeektdejudffjefhteegjedtgeettefggedthfejgfevhfetgeekjedtvdfhveenucfkphepgedurdeiiedrieejrdduudefnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepgedurdeiiedrieejrdduudefpdhhvghloheplhhotggrlhhhohhsthdpmhgrihhlfhhrohhmpehmihgthhgrvghlsehnihgvuggvrhhmrgihvghrrdgttgdpnhgspghrtghpthhtohepuddprhgtphhtthhopehffhhmphgvghdquggvvhgvlhesfhhfmhhpvghgrdhorhhg X-GND-Sasl: michael@niedermayer.cc Subject: Re: [FFmpeg-devel] [PATCH 2/3] lavf: add and use AVRTCPSenderReport struct 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="===============6467424337421620982==" Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: --===============6467424337421620982== Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="Nw47QtTMR5V0Eee5" Content-Disposition: inline --Nw47QtTMR5V0Eee5 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Tue, Jun 24, 2025 at 08:02:01PM +0200, Marvin Scholz wrote: > This will be used in a future commit to expose the SR as side-data. > --- > libavcodec/defs.h | 14 ++++++++++++++ > libavformat/rtpdec.c | 34 ++++++++++++++++++++-------------- > libavformat/rtpdec.h | 4 ++-- > libavformat/rtspdec.c | 2 +- > 4 files changed, 37 insertions(+), 17 deletions(-) this seems not to apply git am -3 Applying: lavf: add and use AVRTCPSenderReport struct error: sha1 information is lacking or useless (libavformat/rtpdec.c). error: could not build fake ancestor Patch failed at 0001 lavf: add and use AVRTCPSenderReport struct hint: Use 'git am --show-current-patch=3Ddiff' to see the failed patch hint: When you have resolved this problem, run "git am --continue". hint: If you prefer to skip this patch, run "git am --skip" instead. hint: To restore the original branch and stop patching, run "git am --abort= ". hint: Disable this message with "git config set advice.mergeConflict false" git am --show-current-patch=3Ddiff | patch -p1 --dry-run -F9 checking file libavcodec/defs.h checking file libavformat/rtpdec.c Hunk #4 FAILED at 602. Hunk #5 FAILED at 622. 2 out of 5 hunks FAILED checking file libavformat/rtpdec.h checking file libavformat/rtspdec.c [...] --=20 Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB Many things microsoft did are stupid, but not doing something just because microsoft did it is even more stupid. If everything ms did were stupid they would be bankrupt already. --Nw47QtTMR5V0Eee5 Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iF0EABEKAB0WIQSf8hKLFH72cwut8TNhHseHBAsPqwUCaF8SOAAKCRBhHseHBAsP qyfbAJ9GCin8ZZ3ZnrXQ3moYqI2NgRWGzgCfXqpr2srL2Zp5sXocuX4Uo5RiSbM= =kYpu -----END PGP SIGNATURE----- --Nw47QtTMR5V0Eee5-- --===============6467424337421620982== 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". --===============6467424337421620982==--