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 AA99A4C7DD for ; Tue, 5 Aug 2025 14:17:38 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id 8195B68C746; Tue, 5 Aug 2025 17:17:35 +0300 (EEST) Received: from mail.kimapr.net (skygaze.kimapr.net [178.18.240.231]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id A1F8768C683 for ; Tue, 5 Aug 2025 17:17:29 +0300 (EEST) Received: by mail.kimapr.net (envelope-sender ) with ESMTPS id 9c1dfc95; Tue, 05 Aug 2025 14:17:29 +0000 Content-Type: multipart/mixed; boundary="------------jmdjHKKSPR3C8F2jRQj7xJXs" Message-ID: <5ffb2a05-5506-4a3e-a7b0-f0cf234ddeb6@kimapr.net> Date: Tue, 5 Aug 2025 19:17:27 +0500 MIME-Version: 1.0 User-Agent: Icedove Daily To: ffmpeg-devel@ffmpeg.org References: <20250303011049.GE4991@pb2> <20250312131732.GX4991@pb2> <20250315003659.GP4991@pb2> <20250517150322.GA29660@pb2> <20250517215726.GB29660@pb2> <20250804144013.GT29660@pb2> <484f34d6-8e2b-4854-9266-cfbbc7ed6554@kimapr.net> Content-Language: en-US In-Reply-To: <484f34d6-8e2b-4854-9266-cfbbc7ed6554@kimapr.net> Subject: Re: [FFmpeg-devel] FFmpeg 6.1.3 and 7.0.3 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: , From: kimapr via ffmpeg-devel Reply-To: FFmpeg development discussions and patches Cc: kimapr Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: This is a multi-part message in MIME format. --------------jmdjHKKSPR3C8F2jRQj7xJXs Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit On 2025/08/05 01:02, kimapr via ffmpeg-devel wrote: > Hi! it would be nice if my bug fix > > avformat/libopenmpt: fix seeking weirdness > > was backported to 6.1.3 and 7.0.3 (dunno about 5.1.7 as i haven't checked > if libopenmpt even exists there). not sure how that would work from my side I just checked, and it seems that my patch can be backported as far back as 3.2 (it cannot be backported to 3.1 or earlier because libopenmpt demuxer does not exist there, 3.2 code is similar enough to today's code) On 5.0 and earlier there is a merge conflict because a line of code near my change had changed a little bit so here's a version of the patch with conflict solved for convenience, for later versions (including 5.1) just rebase ecef5f9e1f i haven't tested the patch on top of anything older than 6.1.1 so i don't know if the seeking problems exist there, but the patch shouldn't break anything either as it doesn't depend on any APIs that were changed between 3.2 and latest --------------jmdjHKKSPR3C8F2jRQj7xJXs Content-Type: text/x-patch; charset=UTF-8; name="0001-avformat-libopenmpt-fix-seeking-weirdness_ffmpeg_3.2-5.0.patch" Content-Disposition: attachment; filename*0="0001-avformat-libopenmpt-fix-seeking-weirdness_ffmpeg_3.2-5."; filename*1="0.patch" Content-Transfer-Encoding: base64 RnJvbSAzZGM4MTI2NGNmNmU1MTkwYzY5YWUzNWM4N2UwYzI1NDdiMzZiMjliIE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBLaW1hcHIgPHJvb3RAa2ltYXByLm5ldD4KRGF0ZTog TW9uLCAyOCBKdWwgMjAyNSAwNjozMjoyNyArMDUwMApTdWJqZWN0OiBbUEFUQ0hdIGF2Zm9y bWF0L2xpYm9wZW5tcHQ6IGZpeCBzZWVraW5nIHdlaXJkbmVzcwoKLSBwcm9wZXIgcHRzIGZv ciBwYWNrZXRzLiBsZWF2aW5nIGl0IGJsYW5rIGxlYXZlcyBpdCB1cCBmb3IgZ3Vlc3Npbmcs CiAgYnV0IHRoZSBndWVzcyBkb2Vzbid0IHRha2Ugc2Vla2luZyBpbnRvIGFjY291bnQsIGNh dXNpbmcgd2VpcmRuZXNzLgoKLSBjbGFtcCB0byAwIHdoZW4gc2Vla2luZyB0byBuZWdhdGl2 ZSB0cy4gbGlib3Blbm1wdCBkb2NzIGFyZSB1bmNsZWFyIG9uCiAgdGhpcyBidXQgbm90IGRv aW5nIHRoaXMgY2F1c2VzIGFuIGltbWVkaWF0ZSBFT0Ygd2hlbiBzZWVraW5nIGJhY2t3YXJk cwogIHRvIHRoZSBiZWdpbm5pbmcgaW4gbXB2LgoKLSBvbmx5IHNldCBzb25nIGR1cmF0aW9u IGFuZCBwYWNrZXQgcHRzIHdoZW4gdGhleSBhcmUgbm9uLW5lZ2F0aXZlIGFuZAogIGluIGlu dDY0IHJhbmdlLiBOYU5zIGNvdW50IGFzIG91dCBvZiByYW5nZS4gdGhpcyBpc24ndCBhIGZp eCBmb3IgYW55CiAgc3BlY2lmaWMgaXNzdWUgYnV0IG1pZ2h0IGJlIGhlbHBmdWwgc3RpbGws IGFuZCBzaG91bGRuJ3QgYnJlYWsKICBhbnl0aGluZy4KLS0tCiBsaWJhdmZvcm1hdC9saWJv cGVubXB0LmMgfCAxMCArKysrKysrKystCiAxIGZpbGUgY2hhbmdlZCwgOSBpbnNlcnRpb25z KCspLCAxIGRlbGV0aW9uKC0pCgpkaWZmIC0tZ2l0IGEvbGliYXZmb3JtYXQvbGlib3Blbm1w dC5jIGIvbGliYXZmb3JtYXQvbGlib3Blbm1wdC5jCmluZGV4IDgwMDZjMDg1ZGYuLjFlZDQ4 ZmE5MDAgMTAwNjQ0Ci0tLSBhL2xpYmF2Zm9ybWF0L2xpYm9wZW5tcHQuYworKysgYi9saWJh dmZvcm1hdC9saWJvcGVubXB0LmMKQEAgLTE1MCw3ICsxNTAsOCBAQCBzdGF0aWMgaW50IHJl YWRfaGVhZGVyX29wZW5tcHQoQVZGb3JtYXRDb250ZXh0ICpzKQogICAgIGlmICghc3QpCiAg ICAgICAgIHJldHVybiBBVkVSUk9SKEVOT01FTSk7CiAgICAgYXZwcml2X3NldF9wdHNfaW5m byhzdCwgNjQsIDEsIEFWX1RJTUVfQkFTRSk7Ci0gICAgc3QtPmR1cmF0aW9uID0gbGxyaW50 KG9wZW5tcHQtPmR1cmF0aW9uKkFWX1RJTUVfQkFTRSk7CisgICAgaWYgKG9wZW5tcHQtPmR1 cmF0aW9uID49IDAgJiYgb3Blbm1wdC0+ZHVyYXRpb24gPCAoKGRvdWJsZSlJTlQ2NF9NQVgg KyAxKSAvIEFWX1RJTUVfQkFTRSkKKyAgICAgICAgc3QtPmR1cmF0aW9uID0gbGxyaW50KG9w ZW5tcHQtPmR1cmF0aW9uKkFWX1RJTUVfQkFTRSk7CiAKICAgICBzdC0+Y29kZWNwYXItPmNv ZGVjX3R5cGUgID0gQVZNRURJQV9UWVBFX0FVRElPOwogICAgIHN0LT5jb2RlY3Bhci0+Y29k ZWNfaWQgICAgPSBBVl9ORShBVl9DT0RFQ19JRF9QQ01fRjMyQkUsIEFWX0NPREVDX0lEX1BD TV9GMzJMRSk7CkBAIC0xNzEsNiArMTcyLDggQEAgc3RhdGljIGludCByZWFkX3BhY2tldF9v cGVubXB0KEFWRm9ybWF0Q29udGV4dCAqcywgQVZQYWNrZXQgKnBrdCkKICAgICBpZiAoKHJl dCA9IGF2X25ld19wYWNrZXQocGt0LCBBVURJT19QS1RfU0laRSkpIDwgMCkKICAgICAgICAg cmV0dXJuIHJldDsKIAorICAgIGRvdWJsZSBwb3MgPSBvcGVubXB0X21vZHVsZV9nZXRfcG9z aXRpb25fc2Vjb25kcyhvcGVubXB0LT5tb2R1bGUpOworCiAgICAgc3dpdGNoIChvcGVubXB0 LT5jaGFubmVscykgewogICAgIGNhc2UgMToKICAgICAgICAgcmV0ID0gb3Blbm1wdF9tb2R1 bGVfcmVhZF9mbG9hdF9tb25vKG9wZW5tcHQtPm1vZHVsZSwgb3Blbm1wdC0+c2FtcGxlX3Jh dGUsCkBAIC0xOTYsNiArMTk5LDkgQEAgc3RhdGljIGludCByZWFkX3BhY2tldF9vcGVubXB0 KEFWRm9ybWF0Q29udGV4dCAqcywgQVZQYWNrZXQgKnBrdCkKIAogICAgIHBrdC0+c2l6ZSA9 IHJldCAqIChvcGVubXB0LT5jaGFubmVscyAqIDQpOwogCisgICAgaWYgKHBvcyA+PSAwICYm IHBvcyA8ICgoZG91YmxlKUlOVDY0X01BWCArIDEpIC8gQVZfVElNRV9CQVNFKQorICAgICAg ICBwa3QtPnB0cyA9IGxscmludChwb3MgKiBBVl9USU1FX0JBU0UpOworCiAgICAgcmV0dXJu IDA7CiB9CiAKQEAgLTIxMiw2ICsyMTgsOCBAQCBzdGF0aWMgaW50IHJlYWRfY2xvc2Vfb3Bl bm1wdChBVkZvcm1hdENvbnRleHQgKnMpCiBzdGF0aWMgaW50IHJlYWRfc2Vla19vcGVubXB0 KEFWRm9ybWF0Q29udGV4dCAqcywgaW50IHN0cmVhbV9pZHgsIGludDY0X3QgdHMsIGludCBm bGFncykKIHsKICAgICBPcGVuTVBUQ29udGV4dCAqb3Blbm1wdCA9IHMtPnByaXZfZGF0YTsK KyAgICBpZiAodHMgPCAwKQorICAgICAgICB0cyA9IDA7CiAgICAgb3Blbm1wdF9tb2R1bGVf c2V0X3Bvc2l0aW9uX3NlY29uZHMob3Blbm1wdC0+bW9kdWxlLCAoZG91YmxlKXRzL0FWX1RJ TUVfQkFTRSk7CiAgICAgcmV0dXJuIDA7CiB9Ci0tIAoyLjQ5LjAKCg== --------------jmdjHKKSPR3C8F2jRQj7xJXs 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". --------------jmdjHKKSPR3C8F2jRQj7xJXs--