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 8C66B49CE6 for ; Fri, 8 Mar 2024 11:49:10 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 862EC68CF38; Fri, 8 Mar 2024 13:49:07 +0200 (EET) Received: from mail-4027.protonmail.ch (mail-4027.protonmail.ch [185.70.40.27]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 67DC368C74E for ; Fri, 8 Mar 2024 13:49:01 +0200 (EET) Date: Fri, 08 Mar 2024 11:48:49 +0000 To: FFmpeg development discussions and patches Message-ID: In-Reply-To: References: Feedback-ID: 33509725:user:proton MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="b1_ydGrMvtm4L7uSHOpMPAny8NfBpB6GC9E33oxD136B8" Subject: Re: [FFmpeg-devel] [PATCH] avformat/aea: Add aea muxer 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: asivery via ffmpeg-devel Reply-To: FFmpeg development discussions and patches Cc: asivery 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. --b1_ydGrMvtm4L7uSHOpMPAny8NfBpB6GC9E33oxD136B8 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Apologies for my oversight. I've attached the new patch.=20 - asivery On Friday, March 8th, 2024 at 12:22 PM, Andreas Rheinhardt wrote: > asivery via ffmpeg-devel: >=20 > > diff --git a/libavformat/allformats.c b/libavformat/allformats.c > > index b04b43cab3..1a50181447 100644 > > --- a/libavformat/allformats.c > > +++ b/libavformat/allformats.c > > @@ -46,6 +46,7 @@ extern const FFOutputFormat ff_adts_muxer; > > extern const AVInputFormat ff_adx_demuxer; > > extern const FFOutputFormat ff_adx_muxer; > > extern const AVInputFormat ff_aea_demuxer; > > +extern const FFOutputFormat ff_aea_muxer; > > extern const AVInputFormat ff_afc_demuxer; > > extern const AVInputFormat ff_aiff_demuxer; > > extern const FFOutputFormat ff_aiff_muxer; > > -- >=20 >=20 > Resend the patch rebased on current master. >=20 > - Andreas >=20 > _______________________________________________ > ffmpeg-devel mailing list > ffmpeg-devel@ffmpeg.org > https://ffmpeg.org/mailman/listinfo/ffmpeg-devel >=20 > To unsubscribe, visit link above, or email > ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe". --b1_ydGrMvtm4L7uSHOpMPAny8NfBpB6GC9E33oxD136B8 Content-Type: text/x-patch; name=0001-avformat-aea-Add-aea-muxer.patch Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename=0001-avformat-aea-Add-aea-muxer.patch RnJvbSA5MzIzMzE2YzlmODJhMTEyMTFhZTJlN2NiOWQ4ZmRlNWUwNjc3MmIwIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBhc2l2ZXJ5IDxhc2l2ZXJ5QHByb3Rvbm1haWwuY29tPgpEYXRl OiBGcmksIDggTWFyIDIwMjQgMTI6NDQ6MDMgKzAxMDAKU3ViamVjdDogW1BBVENIXSBhdmZvcm1h dC9hZWE6IEFkZCBhZWEgbXV4ZXIKClNpZ25lZC1vZmYtYnk6IGFzaXZlcnkgPGFzaXZlcnlAcHJv dG9ubWFpbC5jb20+Ci0tLQogbGliYXZmb3JtYXQvTWFrZWZpbGUgICAgICAgICAgICB8ICAgMyAr LQogbGliYXZmb3JtYXQve2FlYS5jID0+IGFlYWRlYy5jfSB8ICAgMAogbGliYXZmb3JtYXQvYWVh ZW5jLmMgICAgICAgICAgICB8IDEzNCArKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKwog bGliYXZmb3JtYXQvYWxsZm9ybWF0cy5jICAgICAgICB8ICAgMSArCiA0IGZpbGVzIGNoYW5nZWQs IDEzNyBpbnNlcnRpb25zKCspLCAxIGRlbGV0aW9uKC0pCiByZW5hbWUgbGliYXZmb3JtYXQve2Fl YS5jID0+IGFlYWRlYy5jfSAoMTAwJSkKIGNyZWF0ZSBtb2RlIDEwMDY0NCBsaWJhdmZvcm1hdC9h ZWFlbmMuYwoKZGlmZiAtLWdpdCBhL2xpYmF2Zm9ybWF0L01ha2VmaWxlIGIvbGliYXZmb3JtYXQv TWFrZWZpbGUKaW5kZXggODgxMWEwZmZjOS4uNTJlMGIxZGNhZCAxMDA2NDQKLS0tIGEvbGliYXZm b3JtYXQvTWFrZWZpbGUKKysrIGIvbGliYXZmb3JtYXQvTWFrZWZpbGUKQEAgLTkxLDcgKzkxLDgg QEAgT0JKUy0kKENPTkZJR19BRFRTX01VWEVSKSAgICAgICAgICAgICAgICArPSBhZHRzZW5jLm8g YXBldGFnLm8gaW1nMi5vIFwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgaWQzdjJlbmMubwogT0JKUy0kKENPTkZJR19BRFhfREVNVVhFUikgICAgICAgICAgICAg ICArPSBhZHhkZWMubwogT0JKUy0kKENPTkZJR19BRFhfTVVYRVIpICAgICAgICAgICAgICAgICAr PSByYXdlbmMubwotT0JKUy0kKENPTkZJR19BRUFfREVNVVhFUikgICAgICAgICAgICAgICArPSBh ZWEubyBwY20ubworT0JKUy0kKENPTkZJR19BRUFfREVNVVhFUikgICAgICAgICAgICAgICArPSBh ZWFkZWMubyBwY20ubworT0JKUy0kKENPTkZJR19BRUFfTVVYRVIpICAgICAgICAgICAgICAgICAr PSBhZWFlbmMubwogT0JKUy0kKENPTkZJR19BRkNfREVNVVhFUikgICAgICAgICAgICAgICArPSBh ZmMubwogT0JKUy0kKENPTkZJR19BSUZGX0RFTVVYRVIpICAgICAgICAgICAgICArPSBhaWZmZGVj Lm8gYWlmZi5vIHBjbS5vIFwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgbW92X2NoYW4ubyByZXBsYXlnYWluLm8KZGlmZiAtLWdpdCBhL2xpYmF2Zm9ybWF0L2Fl YS5jIGIvbGliYXZmb3JtYXQvYWVhZGVjLmMKc2ltaWxhcml0eSBpbmRleCAxMDAlCnJlbmFtZSBm cm9tIGxpYmF2Zm9ybWF0L2FlYS5jCnJlbmFtZSB0byBsaWJhdmZvcm1hdC9hZWFkZWMuYwpkaWZm IC0tZ2l0IGEvbGliYXZmb3JtYXQvYWVhZW5jLmMgYi9saWJhdmZvcm1hdC9hZWFlbmMuYwpuZXcg ZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwLi4zY2U0Y2VjMWVlCi0tLSAvZGV2L251 bGwKKysrIGIvbGliYXZmb3JtYXQvYWVhZW5jLmMKQEAgLTAsMCArMSwxMzQgQEAKKy8qCisgKiBN RCBTVFVESU8gYXVkaW8gbXV4ZXIKKyAqCisgKiBDb3B5cmlnaHQgKGMpIDIwMjQgYXNpdmVyeQor ICoKKyAqIFRoaXMgZmlsZSBpcyBwYXJ0IG9mIEZGbXBlZy4KKyAqCisgKiBGRm1wZWcgaXMgZnJl ZSBzb2Z0d2FyZTsgeW91IGNhbiByZWRpc3RyaWJ1dGUgaXQgYW5kL29yCisgKiBtb2RpZnkgaXQg dW5kZXIgdGhlIHRlcm1zIG9mIHRoZSBHTlUgTGVzc2VyIEdlbmVyYWwgUHVibGljCisgKiBMaWNl bnNlIGFzIHB1Ymxpc2hlZCBieSB0aGUgRnJlZSBTb2Z0d2FyZSBGb3VuZGF0aW9uOyBlaXRoZXIK KyAqIHZlcnNpb24gMi4xIG9mIHRoZSBMaWNlbnNlLCBvciAoYXQgeW91ciBvcHRpb24pIGFueSBs YXRlciB2ZXJzaW9uLgorICoKKyAqIEZGbXBlZyBpcyBkaXN0cmlidXRlZCBpbiB0aGUgaG9wZSB0 aGF0IGl0IHdpbGwgYmUgdXNlZnVsLAorICogYnV0IFdJVEhPVVQgQU5ZIFdBUlJBTlRZOyB3aXRo b3V0IGV2ZW4gdGhlIGltcGxpZWQgd2FycmFudHkgb2YKKyAqIE1FUkNIQU5UQUJJTElUWSBvciBG SVRORVNTIEZPUiBBIFBBUlRJQ1VMQVIgUFVSUE9TRS4gIFNlZSB0aGUgR05VCisgKiBMZXNzZXIg R2VuZXJhbCBQdWJsaWMgTGljZW5zZSBmb3IgbW9yZSBkZXRhaWxzLgorICoKKyAqIFlvdSBzaG91 bGQgaGF2ZSByZWNlaXZlZCBhIGNvcHkgb2YgdGhlIEdOVSBMZXNzZXIgR2VuZXJhbCBQdWJsaWMK KyAqIExpY2Vuc2UgYWxvbmcgd2l0aCBGRm1wZWc7IGlmIG5vdCwgd3JpdGUgdG8gdGhlIEZyZWUg U29mdHdhcmUKKyAqIEZvdW5kYXRpb24sIEluYy4sIDUxIEZyYW5rbGluIFN0cmVldCwgRmlmdGgg Rmxvb3IsIEJvc3RvbiwgTUEgMDIxMTAtMTMwMSBVU0EKKyAqLworCisjaW5jbHVkZSAibGliYXZ1 dGlsL2NoYW5uZWxfbGF5b3V0LmgiCisjaW5jbHVkZSAibGliYXZ1dGlsL2ludHJlYWR3cml0ZS5o IgorI2luY2x1ZGUgImxpYmF2dXRpbC9hdnN0cmluZy5oIgorI2luY2x1ZGUgImF2Zm9ybWF0Lmgi CisjaW5jbHVkZSAibXV4LmgiCisKK3R5cGVkZWYgc3RydWN0IHsKKyAgICBpbnQgYmxvY2tfY291 bnQ7Cit9IEFlYU11eGVyQ29udGV4dDsKKworc3RhdGljIGludCBhZWFfaW5pdChBVkZvcm1hdENv bnRleHQgKnMpCit7CisgICAgQWVhTXV4ZXJDb250ZXh0ICpjID0gcy0+cHJpdl9kYXRhOworICAg IGMtPmJsb2NrX2NvdW50ID0gMDsKKyAgICAKKyAgICByZXR1cm4gMDsKK30KKworc3RhdGljIGlu dCBhZWFfd3JpdGVfaGVhZGVyKEFWRm9ybWF0Q29udGV4dCAqcykKK3sKKyAgICBBVkRpY3Rpb25h cnlFbnRyeSAqdGl0bGVfZW50cnk7CisgICAgaW50IHRpdGxlX2xlbmd0aCA9IDAsIGk7CisgICAg Y2hhciogdGl0bGVfY29udGVudHM7CisgICAgQVZTdHJlYW0gKnN0OworCisKKyAgICBpZiAocy0+ bmJfc3RyZWFtcyA+IDEpIHsKKyAgICAgICAgYXZfbG9nKHMsIEFWX0xPR19XQVJOSU5HLCAiR290 IG1vcmUgdGhhbiBvbmUgc3RyZWFtIHRvIGVuY29kZSwgdGhleSB3aWxsIGJlIGlnbm9yZWQuXG4i KTsKKyAgICB9CisgICAgCisgICAgc3QgPSBzLT5zdHJlYW1zWzBdOworICAgIGlmIChzdC0+Y29k ZWNwYXItPmNoX2xheW91dC5uYl9jaGFubmVscyAhPSAxICYmIHN0LT5jb2RlY3Bhci0+Y2hfbGF5 b3V0Lm5iX2NoYW5uZWxzICE9IDIpIHsKKyAgICAgICAgYXZfbG9nKHMsIEFWX0xPR19FUlJPUiwg IkludmFsaWQgYW1vdW50IG9mIGNoYW5uZWxzIHRvIG11eCAoJWQpLlxuIiwgc3QtPmNvZGVjcGFy LT5jaF9sYXlvdXQubmJfY2hhbm5lbHMpOworICAgICAgICByZXR1cm4gQVZFUlJPUihFSU5WQUwp OworICAgIH0KKworICAgIGlmIChzdC0+Y29kZWNwYXItPnNhbXBsZV9yYXRlICE9IDQ0MTAwKSB7 CisgICAgICAgIGF2X2xvZyhzLCBBVl9MT0dfRVJST1IsICJJbnZhbGlkIHNhbXBsZSByYXRlICgl ZCkgQUVBIG9ubHkgc3VwcG9ydHMgNDQuMWtIei5cbiIsIHN0LT5jb2RlY3Bhci0+c2FtcGxlX3Jh dGUpOworICAgICAgICByZXR1cm4gQVZFUlJPUihFSU5WQUwpOworICAgIH0KKworICAgIC8qIFdy aXRlIG1hZ2ljICovCisgICAgYXZpb193bDMyKHMtPnBiLCAyMDQ4KTsKKyAgICAKKyAgICAvKiBX cml0ZSBBRUEgdGl0bGUgKi8KKyAgICB0aXRsZV9lbnRyeSA9IGF2X2RpY3RfZ2V0KHN0LT5tZXRh ZGF0YSwgInRpdGxlIiwgTlVMTCwgMCk7CisgICAgaWYgKHRpdGxlX2VudHJ5KSB7CisgICAgICAg IHRpdGxlX2NvbnRlbnRzID0gdGl0bGVfZW50cnktPnZhbHVlOworICAgICAgICB0aXRsZV9sZW5n dGggPSBGRk1JTigyNTYsIHN0cmxlbih0aXRsZV9jb250ZW50cykpOworICAgIH0KKworICAgIGlm ICh0aXRsZV9sZW5ndGgpIHsKKyAgICAgICAgYXZpb193cml0ZShzLT5wYiwgdGl0bGVfY29udGVu dHMsIHRpdGxlX2xlbmd0aCk7CisgICAgfQorCisgICAgZm9yIChpID0gMDsgaTwoMjU2IC0gdGl0 bGVfbGVuZ3RoKTsgaSsrKSB7CisgICAgICAgIGF2aW9fdzgocy0+cGIsIDApOworICAgIH0KKwor ICAgIC8qIFdyaXRlIG51bWJlciBvZiBmcmFtZXMgKHplcm8gYXQgaGVhZGVyLXdyaXRpbmcgdGlt ZSwgd2lsbCBzZWVrIGxhdGVyKSwgbnVtYmVyIG9mIGNoYW5uZWxzICovCisgICAgYXZpb193bDMy KHMtPnBiLCAwKTsKKyAgICBhdmlvX3c4KHMtPnBiLCBzdC0+Y29kZWNwYXItPmNoX2xheW91dC5u Yl9jaGFubmVscyk7CisgICAgYXZpb193OChzLT5wYiwgMCk7CisKKyAgICAvKiBXcml0ZSBmbGFn cyAobWVhbmluZyB1bmtub3duKSAqLyAKKyAgICBmb3IoaSA9IDA7IGk8MTE7IGkrKykgeworICAg ICAgICBhdmlvX3dsMzIocy0+cGIsIDApOworICAgIH0KKworICAgIC8qIFBhZCB0aGUgaGVhZGVy IHRvIDIwNDggYnl0ZXMgKi8KKyAgICBmb3IoaSA9IDA7IGk8MTczODsgaSsrKSBhdmlvX3c4KHMt PnBiLCAwKTsKKworICAgIHJldHVybiAwOworfQorCitzdGF0aWMgaW50IGFlYV93cml0ZV9wYWNr ZXQoc3RydWN0IEFWRm9ybWF0Q29udGV4dCAqcywgQVZQYWNrZXQgKnBrdCkKK3sKKyAgICBBZWFN dXhlckNvbnRleHQgKmMgPSBzLT5wcml2X2RhdGE7CisgICAgYy0+YmxvY2tfY291bnQrKzsKKwor ICAgIGF2aW9fd3JpdGUocy0+cGIsIHBrdC0+ZGF0YSwgcGt0LT5zaXplKTsKKyAgICByZXR1cm4g MDsKK30KKworc3RhdGljIGludCBhZWFfd3JpdGVfdHJhaWxlcihzdHJ1Y3QgQVZGb3JtYXRDb250 ZXh0ICpzKQoreworICAgIEFWSU9Db250ZXh0ICpwYiA9IHMtPnBiOworICAgIEFlYU11eGVyQ29u dGV4dCAqYyA9IHMtPnByaXZfZGF0YTsKKyAgICBpZiAocGItPnNlZWthYmxlICYgQVZJT19TRUVL QUJMRV9OT1JNQUwpIHsKKyAgICAgICAgLyogU2VlayB0byByZXdyaXRlIHRoZSBibG9jayBjb3Vu dC4gKi8KKyAgICAgICAgYXZpb19zZWVrKHBiLCAyNjAsIFNFRUtfU0VUKTsKKyAgICAgICAgYXZp b193bDMyKHBiLCBjLT5ibG9ja19jb3VudCAqIHMtPnN0cmVhbXNbMF0tPmNvZGVjcGFyLT5jaF9s YXlvdXQubmJfY2hhbm5lbHMpOworICAgIH0gZWxzZSB7CisgICAgICAgIGF2X2xvZyhzLCBBVl9M T0dfV0FSTklORywgInVuYWJsZSB0byByZXdyaXRlIEFFQSBoZWFkZXIuXG4iKTsKKyAgICB9CisK KyAgICByZXR1cm4gMDsKK30KKworY29uc3QgRkZPdXRwdXRGb3JtYXQgZmZfYWVhX211eGVyID0g eworICAgIC5wLm5hbWUgICAgICAgICAgID0gImFlYSIsCisgICAgLnAubG9uZ19uYW1lICAgICAg PSBOVUxMX0lGX0NPTkZJR19TTUFMTCgiTUQgU1RVRElPIGF1ZGlvIiksCisgICAgLnByaXZfZGF0 YV9zaXplICAgPSBzaXplb2YoQWVhTXV4ZXJDb250ZXh0KSwKKyAgICAucC5leHRlbnNpb25zICAg ICA9ICJhZWEiLAorICAgIC5wLmF1ZGlvX2NvZGVjICAgID0gQVZfQ09ERUNfSURfQVRSQUMxLAor ICAgIC5pbml0ICAgICAgICAgICAgID0gYWVhX2luaXQsCisKKyAgICAud3JpdGVfaGVhZGVyICAg ICA9IGFlYV93cml0ZV9oZWFkZXIsCisgICAgLndyaXRlX3BhY2tldCAgICAgPSBhZWFfd3JpdGVf cGFja2V0LAorICAgIC53cml0ZV90cmFpbGVyICAgID0gYWVhX3dyaXRlX3RyYWlsZXIsCisgICAg LnAuZmxhZ3MgICAgICAgICAgPSBBVkZNVF9HRU5FUklDX0lOREVYLAorfTsKZGlmZiAtLWdpdCBh L2xpYmF2Zm9ybWF0L2FsbGZvcm1hdHMuYyBiL2xpYmF2Zm9ybWF0L2FsbGZvcm1hdHMuYwppbmRl eCAwYTBlNzYxMzhmLi41NjM5NzE1MTA0IDEwMDY0NAotLS0gYS9saWJhdmZvcm1hdC9hbGxmb3Jt YXRzLmMKKysrIGIvbGliYXZmb3JtYXQvYWxsZm9ybWF0cy5jCkBAIC00Nyw2ICs0Nyw3IEBAIGV4 dGVybiBjb25zdCBGRk91dHB1dEZvcm1hdCBmZl9hZHRzX211eGVyOwogZXh0ZXJuIGNvbnN0IEZG SW5wdXRGb3JtYXQgIGZmX2FkeF9kZW11eGVyOwogZXh0ZXJuIGNvbnN0IEZGT3V0cHV0Rm9ybWF0 IGZmX2FkeF9tdXhlcjsKIGV4dGVybiBjb25zdCBGRklucHV0Rm9ybWF0ICBmZl9hZWFfZGVtdXhl cjsKK2V4dGVybiBjb25zdCBGRk91dHB1dEZvcm1hdCBmZl9hZWFfbXV4ZXI7CiBleHRlcm4gY29u c3QgRkZJbnB1dEZvcm1hdCAgZmZfYWZjX2RlbXV4ZXI7CiBleHRlcm4gY29uc3QgRkZJbnB1dEZv cm1hdCAgZmZfYWlmZl9kZW11eGVyOwogZXh0ZXJuIGNvbnN0IEZGT3V0cHV0Rm9ybWF0IGZmX2Fp ZmZfbXV4ZXI7Ci0tIAoyLjM0LjEKCg== --b1_ydGrMvtm4L7uSHOpMPAny8NfBpB6GC9E33oxD136B8 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". --b1_ydGrMvtm4L7uSHOpMPAny8NfBpB6GC9E33oxD136B8--