From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <ffmpeg-devel-bounces@ffmpeg.org> Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTPS id DCDD84C23A for <ffmpegdev@gitmailbox.com>; Wed, 2 Apr 2025 17:43:16 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E376768813C; Wed, 2 Apr 2025 20:43:11 +0300 (EEST) Received: from relay8-d.mail.gandi.net (relay8-d.mail.gandi.net [217.70.183.201]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9388B687D80 for <ffmpeg-devel@ffmpeg.org>; Wed, 2 Apr 2025 20:43:05 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id D5E5344443 for <ffmpeg-devel@ffmpeg.org>; Wed, 2 Apr 2025 17:43:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1743615785; 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=/cny5zNJYd9dNGUxR7pumgspXdW3LPQEtObj1xPPYrM=; b=jel5t+r3Ecp3CLg+Nt/HHuAPvqLinc9dXc2LHkcZWK8AvpdpJwNnh+TJlwtloCpXSJtPjE dgy5i7BZUIu+akIGLjQkDG29bbtU4wpirjEI0sDqryaRgxm77uS8bx99EB1UreSRU9kZOb PkmmGYz6Ex77KpKgcwmn3l1SMiLDE2Rtd6VIV6tlniiv3L13fO1aQcVsLGbLgZgMUUt2yn oqP34yfU7I30kTy6hm6WAzxe+2z82jfZFxkzYxPjfeCwy46ujcrduy0RGRJC58013OVSJo QEszgndXPToVRv3wMcmcy0gaFRxRf32nfXGXI+S7RM4ASG57YPHmM02kQSNUzw== Date: Wed, 2 Apr 2025 19:43:03 +0200 From: Michael Niedermayer <michael@niedermayer.cc> To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org> Message-ID: <20250402174303.GH4991@pb2> References: <20250324145059.16593-1-romain.beauxis@gmail.com> <20250324145059.16593-2-romain.beauxis@gmail.com> MIME-Version: 1.0 In-Reply-To: <20250324145059.16593-2-romain.beauxis@gmail.com> X-GND-State: clean X-GND-Score: -70 X-GND-Cause: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgddukeeivdelucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuifetpfffkfdpucggtfgfnhhsuhgsshgtrhhisggvnecuuegrihhlohhuthemuceftddunecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenfghrlhcuvffnffculdeftddmnecujfgurhepfffhvffukfhfgggtuggjsehgtderredttddvnecuhfhrohhmpefoihgthhgrvghlucfpihgvuggvrhhmrgihvghruceomhhitghhrggvlhesnhhivgguvghrmhgrhigvrhdrtggtqeenucggtffrrghtthgvrhhnpeeigeektdejudffjefhteegjedtgeettefggedthfejgfevhfetgeekjedtvdfhveenucfkphepgedurdeiiedrieejrdduudefnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepgedurdeiiedrieejrdduudefpdhhvghloheplhhotggrlhhhohhsthdpmhgrihhlfhhrohhmpehmihgthhgrvghlsehnihgvuggvrhhmrgihvghrrdgttgdpnhgspghrtghpthhtohepuddprhgtphhtthhopehffhhmphgvghdquggvvhgvlhesfhhfmhhpvghgrdhorhhg X-GND-Sasl: michael@niedermayer.cc Subject: Re: [FFmpeg-devel] [PATCH v9 1/8] libavcodec/decode.c: intercept `AV_PKT_DATA_METADATA_UPDATE` packet extra data, attach them to the next decoded frame with the same PTS. X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches <ffmpeg-devel.ffmpeg.org> List-Unsubscribe: <https://ffmpeg.org/mailman/options/ffmpeg-devel>, <mailto:ffmpeg-devel-request@ffmpeg.org?subject=unsubscribe> List-Archive: <https://ffmpeg.org/pipermail/ffmpeg-devel> List-Post: <mailto:ffmpeg-devel@ffmpeg.org> List-Help: <mailto:ffmpeg-devel-request@ffmpeg.org?subject=help> List-Subscribe: <https://ffmpeg.org/mailman/listinfo/ffmpeg-devel>, <mailto:ffmpeg-devel-request@ffmpeg.org?subject=subscribe> Reply-To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org> Content-Type: multipart/mixed; boundary="===============2842595426851101671==" Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" <ffmpeg-devel-bounces@ffmpeg.org> Archived-At: <https://master.gitmailbox.com/ffmpegdev/20250402174303.GH4991@pb2/> List-Archive: <https://master.gitmailbox.com/ffmpegdev/> List-Post: <mailto:ffmpegdev@gitmailbox.com> --===============2842595426851101671== Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="9j93r7IO17e8c7wX" Content-Disposition: inline --9j93r7IO17e8c7wX Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Mon, Mar 24, 2025 at 09:50:52AM -0500, Romain Beauxis wrote: > --- > libavcodec/decode.c | 131 ++++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 131 insertions(+) doesnt apply cleanly: Applying: libavcodec/decode.c: intercept `AV_PKT_DATA_METADATA_UPDATE` pack= et extra data, attach them to the next decoded frame with the same PTS. Using index info to reconstruct a base tree... M libavcodec/decode.c =2Egit/rebase-apply/patch:74: tab in indent. ret->data =3D pending->data; warning: 1 line adds whitespace errors. Falling back to patching base and 3-way merge... Auto-merging libavcodec/decode.c CONFLICT (content): Merge conflict in libavcodec/decode.c error: Failed to merge in the changes. Patch failed at 0001 libavcodec/decode.c: intercept `AV_PKT_DATA_METADATA_U= PDATE` packet extra data, attach them to the next decoded frame with the sa= me PTS. 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" [...] --=20 Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB No human being will ever know the Truth, for even if they happen to say it by chance, they would not even known they had done so. -- Xenophanes --9j93r7IO17e8c7wX Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iF0EABEKAB0WIQSf8hKLFH72cwut8TNhHseHBAsPqwUCZ+13IwAKCRBhHseHBAsP q/nkAJ93F74+RDCdqT8TXqMdQ6JxjoGSKACePFgqZtsgAy9eMi+cl7NKBuxZpRE= =isPV -----END PGP SIGNATURE----- --9j93r7IO17e8c7wX-- --===============2842595426851101671== 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". --===============2842595426851101671==--