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 0E59144F56 for ; Mon, 12 Dec 2022 20:18:14 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C7CDA68BDD8; Mon, 12 Dec 2022 22:18:11 +0200 (EET) Received: from mail-wr1-f45.google.com (mail-wr1-f45.google.com [209.85.221.45]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3C5CB68B43E for ; Mon, 12 Dec 2022 22:18:05 +0200 (EET) Received: by mail-wr1-f45.google.com with SMTP id h16so4442542wrz.12 for ; Mon, 12 Dec 2022 12:18:05 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=Iv5yLVLLQIy/Wq7pDH37XpZavr2g3mUXxg8ueetZSfs=; b=bT5VDrfzcRAB2IfqfV2u15Ts02o/gtemFXBZ7DDPO5BLHUvAEkrAZG9y6MgYGYy1Jp NLnrd86UfvZUcWpPaseSW9ovy3z1+oWXgKIW0/Ly5eo9TTDM7No9eG6NEGYA0yBx+Jlu iK7fYpeQL0WBzIMTovUCb7YjK6YMT72JLHLFoKpGotEbhO+41DHd6n/+hYGn1H7U8ug+ 4qAZcfhFB/0zMj/+8To/E6XzBBfFf8mNbpVpCUXhWS7OVnCtD+kGAs7miwPoBjMzS4N5 SMa254LmNLjBx653yJuERpzvafgCmV9mhtGGvyy9OTh4bTqnj3VU+nhxysRALa6ZfUYM NtDA== X-Gm-Message-State: ANoB5plq64rTkjH25vVZACTzP9akBuRdpL5tFXn0OGE3xG8p/hBvqzJB KKowwZbK2lx9NXAuZtM58IoIZJwxdTE= X-Google-Smtp-Source: AA0mqf7CcFl/Rt/5bPyq9mspEhqdWDoqFANm64yFB0ARDzsVsoBoEpKoz28zZZM2mf1Y7VfF4T7DvA== X-Received: by 2002:adf:f54a:0:b0:242:2244:b15d with SMTP id j10-20020adff54a000000b002422244b15dmr11820108wrp.23.1670876284309; Mon, 12 Dec 2022 12:18:04 -0800 (PST) Received: from localhost.localdomain ([90.243.4.231]) by smtp.gmail.com with ESMTPSA id a18-20020adffb92000000b002424b695f7esm9725429wrr.46.2022.12.12.12.18.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Dec 2022 12:18:03 -0800 (PST) From: facefunk To: ffmpeg-devel@ffmpeg.org Date: Mon, 12 Dec 2022 20:17:48 +0000 Message-Id: <20221212201748.120037-1-facefunk@fcfnk.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] libavcodec: Make disposition forced work with mov_text subtitles. 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: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: V2UgYXJlIG5vdCBjdXJyZW50bHkgYWJsZSB0byBmb3JjZSBtb3ZfdGV4dCBzdWJ0aXRsZXMgYnkg c2V0dGluZyAtZGlzcG9zaXRpb246czowICtmb3JjZWQgb3IgZXF1aXZhbGVudC4gQnkgc2V0dGlu ZyB0aGUgZm9yY2VkIGZsYWdzIGluIG1vdnRleHRlbmMgYXMgc3BlY2lmaWQgaW4gaHR0cHM6Ly9k ZXZlbG9wZXIuYXBwbGUuY29tL2xpYnJhcnkvYXJjaGl2ZS9kb2N1bWVudGF0aW9uL1F1aWNrVGlt ZS9RVEZGL1FURkZDaGFwMy9xdGZmMy5odG1sIHN1YnRpdGxlcyBjYW4gYmUgZm9yY2VkIGFzIGV4 cGVjdGVkIGluIFZMQyBhbmQgc2ltaWxhciBwbGF5ZXJzLgoKQ29weSBBVlN0cmVhbSBkaXNwb3Np dGlvbiB0byBBVkNvZGVjQ29udGV4dCBhbmQgdXNlIHRvIHNldCBESVNQTEFZX0ZMQUdfQUxMX1NB TVBMRVNfRk9SQ0VEIGluIG1vdnRleHRlbmMuYy4KClNpZ25lZC1vZmYtYnk6IGZhY2VmdW5rIDxm YWNlZnVua0BmY2Zuay5jb20+Ci0tLQogZmZ0b29scy9mZm1wZWdfbXV4X2luaXQuYyB8ICA1ICsr KysrCiBsaWJhdmNvZGVjL2F2Y29kZWMuaCAgICAgIHwgMTEgKysrKysrKysrKysKIGxpYmF2Y29k ZWMvbW92dGV4dGVuYy5jICAgfCA0MSArKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysr KysrKy0KIDMgZmlsZXMgY2hhbmdlZCwgNTYgaW5zZXJ0aW9ucygrKSwgMSBkZWxldGlvbigtKQoK ZGlmZiAtLWdpdCBhL2ZmdG9vbHMvZmZtcGVnX211eF9pbml0LmMgYi9mZnRvb2xzL2ZmbXBlZ19t dXhfaW5pdC5jCmluZGV4IDAyODA3NTliMDUuLjg2Y2MzMDRiNzEgMTAwNjQ0Ci0tLSBhL2ZmdG9v bHMvZmZtcGVnX211eF9pbml0LmMKKysrIGIvZmZ0b29scy9mZm1wZWdfbXV4X2luaXQuYwpAQCAt MTcxNyw2ICsxNzE3LDExIEBAIHN0YXRpYyBpbnQgc2V0X2Rpc3Bvc2l0aW9ucyhNdXhlciAqbXV4 LCBjb25zdCBPcHRpb25zQ29udGV4dCAqbykKIAogICAgICAgICAgICAgaWYgKHJldCA8IDApCiAg ICAgICAgICAgICAgICAgZ290byBmaW5pc2g7CisKKyAgICAgICAgICAgIC8vIEZvciBvdXRwdXQg c3RyZWFtcywgU2V0IHN1YnRpdGxlIGZsYWdzIHRvIGZvcmNlZCB3aGVuIHN0cmVhbQorICAgICAg ICAgICAgLy8gZGlzcG9zaXRpb24gaXMgZm9yY2VkLgorICAgICAgICAgICAgaWYob3N0LT5lbmNf Y3R4ICYmIG9zdC0+c3QtPmRpc3Bvc2l0aW9uICYgQVZfRElTUE9TSVRJT05fRk9SQ0VEKQorICAg ICAgICAgICAgICAgIG9zdC0+ZW5jX2N0eC0+c3VidGl0bGVfZmxhZ3MgfD0gQVZfU1VCVElUTEVf RkxBR19GT1JDRUQ7CiAgICAgICAgIH0KICAgICB9IGVsc2UgewogICAgICAgICAvLyBGb3IgZWFj aCBtZWRpYSB0eXBlIHdpdGggbW9yZSB0aGFuIG9uZSBzdHJlYW0sIGZpbmQgYSBzdWl0YWJsZSBz dHJlYW0gdG8KZGlmZiAtLWdpdCBhL2xpYmF2Y29kZWMvYXZjb2RlYy5oIGIvbGliYXZjb2RlYy9h dmNvZGVjLmgKaW5kZXggMGFjNTgxZDY2MC4uMjczNWExYzg0NyAxMDA2NDQKLS0tIGEvbGliYXZj b2RlYy9hdmNvZGVjLmgKKysrIGIvbGliYXZjb2RlYy9hdmNvZGVjLmgKQEAgLTIwNTcsNiArMjA1 NywxNyBAQCB0eXBlZGVmIHN0cnVjdCBBVkNvZGVjQ29udGV4dCB7CiAgICAgICogICAgICAgICAg ICAgVGhlIGRlY29kZXIgY2FuIHRoZW4gb3ZlcnJpZGUgZHVyaW5nIGRlY29kaW5nIGFzIG5lZWRl ZC4KICAgICAgKi8KICAgICBBVkNoYW5uZWxMYXlvdXQgY2hfbGF5b3V0OworCisgICAgLyoqCisg ICAgICogU3VidGl0bGUgY29kZWNzIG9ubHkuIEJpdCBzZXQgb2YgQVZfU1VCVElUTEVfRkxBR18q LgorICAgICAqCisgICAgICogU29tZSBzdWJ0aXRsZSBjb2RlY3MgbWF5IHVzZSB0aGlzIGZpZWxk IHRvIGRldGVybWluZSB0aGUgc3VidGl0bGUKKyAgICAgKiBkaXNwbGF5IGZsYWdzIHRvIGVuY29k ZS4KKyAgICAgKgorICAgICAqIC0gZW5jb2Rpbmc6IHNldCBieSB1c2VyCisgICAgICogLSBkZWNv ZGluZzogdW51c2VkCisgICAgICovCisgICAgaW50IHN1YnRpdGxlX2ZsYWdzOwogfSBBVkNvZGVj Q29udGV4dDsKIAogLyoqCmRpZmYgLS1naXQgYS9saWJhdmNvZGVjL21vdnRleHRlbmMuYyBiL2xp YmF2Y29kZWMvbW92dGV4dGVuYy5jCmluZGV4IDdhYTc0ZDdjOWQuLjg3NWUwMDNmYzQgMTAwNjQ0 Ci0tLSBhL2xpYmF2Y29kZWMvbW92dGV4dGVuYy5jCisrKyBiL2xpYmF2Y29kZWMvbW92dGV4dGVu Yy5jCkBAIC01MCw2ICs1MCw0MCBAQAogI2RlZmluZSBGT05UU0laRV9TQ0FMRShzLGZzKSAoKGZz KSAqIChzKS0+Zm9udF9zY2FsZV9mYWN0b3IgKyAwLjUpCiAjZGVmaW5lIGF2X2JwcmludF9hcHBl bmRfYW55KGJ1ZiwgZGF0YSwgc2l6ZSkgICBhdl9icHJpbnRfYXBwZW5kX2RhdGEoYnVmLCAoKGNv bnN0IGNoYXIqKWRhdGEpLCBzaXplKQogCisvKioKKyAqIGh0dHBzOi8vZGV2ZWxvcGVyLmFwcGxl LmNvbS9saWJyYXJ5L2FyY2hpdmUvZG9jdW1lbnRhdGlvbi9RdWlja1RpbWUvUVRGRi9RVEZGQ2hh cDMvcXRmZjMuaHRtbAorICoKKyAqIERpc3BsYXkgZmxhZ3MKKyAqIEEgMzItYml0IGludGVnZXIg Y29udGFpbmluZyBmbGFncyB0aGF0IGRlc2NyaWJlIGhvdyB0aGUgc3VidGl0bGUgdGV4dCBzaG91 bGQKKyAqIGJlIGRyYXduLgorICogVGhlIGZvbGxvd2luZyBmbGFncyBhcmUgZGVmaW5lZDoKKyAq CisgKiBWZXJ0aWNhbCBwbGFjZW1lbnQKKyAqIENvbnRyb2xzIHZlcnRpY2FsIHBsYWNlbWVudCBv ZiB0aGUgc3VidGl0bGUgdGV4dC4KKyAqIElmIHRoaXMgZmxhZyBpcyBzZXQsIHRoZSBzdWJ0aXRs ZSBtZWRpYSBoYW5kbGVyIHVzZXMgdGhlIHRvcCBjb29yZGluYXRlIG9mCisgKiB0aGUgZGlzcGxh eSBib3VuZHMgb2YgdGhlIG92ZXJyaWRlICd0Ym94JyB0ZXh0IGJveCB0byBkZXRlcm1pbmUgdGhl CisgKiBzdWJ0aXRsZeKAmXMgdmVydGljYWwgcGxhY2VtZW50IGFzIGRlc2NyaWJlZCBpbiBTdWJ0 aXRsZSBUcmFjayBIZWFkZXIgU2l6ZQorICogYW5kIFBsYWNlbWVudC4gT3RoZXJ3aXNlLCB0aGUg c3VidGl0bGUgZGlzcGxheXMgYXQgdGhlIGJvdHRvbSBvZiB0aGUgdmlkZW8uCisgKi8KKyNkZWZp bmUgRElTUExBWV9GTEFHX1ZFUlRJQ0FMX1BMQUNFTUVOVF9UT1AgMHgyMDAwMDAwMAorCisvKioK KyAqIFNvbWUgc2FtcGxlcyBhcmUgZm9yY2VkCisgKiBJbmRpY2F0ZXMgd2hldGhlciBhbnkgc3Vi dGl0bGUgc2FtcGxlcyBjb250YWluIGZvcmNlZCBhdG9tcy4gSWYgdGhpcyBmbGFnIGlzCisgKiBz ZXQsIGF0IGxlYXN0IG9uZSBzYW1wbGUgY29udGFpbnMgYSBmb3JjZWQgKCdmcmNkJykgYXRvbSBh cyBkZXNjcmliZWQgaW4KKyAqIFN1YnRpdGxlIFNhbXBsZSBEYXRhLgorICovCisjZGVmaW5lIERJ U1BMQVlfRkxBR19TT01FX1NBTVBMRVNfRk9SQ0VEICAgIDB4NDAwMDAwMDAKKworLyoqCisgKiBB bGwgc2FtcGxlcyBhcmUgZm9yY2VkCisgKiBJZiB0aGlzIGZsYWcgaXMgc2V0LCB0aGUgc3VidGl0 bGUgbWVkaWEgaGFuZGxlciB0cmVhdHMgYWxsIHNhbXBsZXMgYXMgZm9yY2VkCisgKiBzdWJ0aXRs ZXMsIHJlZ2FyZGxlc3Mgb2YgdGhlIHByZXNlbmNlIG9yIGFic2VuY2Ugb2YgYSAnZnJjZCcgYXRv bS4KKyAqIElmIHRoaXMgZmxhZyBpcyBzZXQsIHRoZSBTb21lIFNhbXBsZXMgQXJlIEZvcmNlZCBm bGFnIG11c3QgYWxzbyBiZSBzZXQKKyAqIChtYWtpbmcgMHhDMDAwMDAwMCkuCisgKi8KKyNkZWZp bmUgRElTUExBWV9GTEFHX0FMTF9TQU1QTEVTX0ZPUkNFRCAgICAgMHg4MDAwMDAwMAorCiB0eXBl ZGVmIHN0cnVjdCB7CiAgICAgdWludDE2X3Qgc3R5bGVfc3RhcnQ7CiAgICAgdWludDE2X3Qgc3R5 bGVfZW5kOwpAQCAtMTgzLDYgKzIxNyw3IEBAIHN0YXRpYyBpbnQgZW5jb2RlX3NhbXBsZV9kZXNj cmlwdGlvbihBVkNvZGVjQ29udGV4dCAqYXZjdHgpCiAgICAgaW50IGZvbnRfbmFtZXNfdG90YWxf bGVuID0gMDsKICAgICBNb3ZUZXh0Q29udGV4dCAqcyA9IGF2Y3R4LT5wcml2X2RhdGE7CiAgICAg dWludDhfdCBidWZbMzBdLCAqcCA9IGJ1ZjsKKyAgICB1aW50MzJfdCBkaXNwbGF5X2ZsYWdzID0g MDsKIAogICAgIC8vICAweDAwLCAweDAwLCAweDAwLCAweDAwLCAvLyB1aW50MzJfdCBkaXNwbGF5 RmxhZ3MKICAgICAvLyAgMHgwMSwgICAgICAgICAgICAgICAgICAgLy8gaW50OF90IGhvcml6b250 YWwtanVzdGlmaWNhdGlvbgpAQCAtMjQxLDcgKzI3NiwxMSBAQCBzdGF0aWMgaW50IGVuY29kZV9z YW1wbGVfZGVzY3JpcHRpb24oQVZDb2RlY0NvbnRleHQgKmF2Y3R4KQogICAgICAgICAgICAgICAg ICAgICAgKDI1NSAtICgodWludDMyX3Qpc3R5bGUtPmJhY2tfY29sb3IgPj4gMjQpKTsKICAgICB9 CiAKLSAgICBieXRlc3RyZWFtX3B1dF9iZTMyKCZwLCAwKTsgLy8gZGlzcGxheUZsYWdzCisgICAg aWYgKGF2Y3R4LT5zdWJ0aXRsZV9mbGFncyAmIEFWX1NVQlRJVExFX0ZMQUdfRk9SQ0VEKQorICAg ICAgICBkaXNwbGF5X2ZsYWdzID0gRElTUExBWV9GTEFHX1NPTUVfU0FNUExFU19GT1JDRUQgfAor ICAgICAgICAgICAgICAgICAgICAgICAgRElTUExBWV9GTEFHX0FMTF9TQU1QTEVTX0ZPUkNFRDsK KworICAgIGJ5dGVzdHJlYW1fcHV0X2JlMzIoJnAsIGRpc3BsYXlfZmxhZ3MpOyAvLyBkaXNwbGF5 RmxhZ3MKICAgICBieXRlc3RyZWFtX3B1dF9iZTE2KCZwLCAweDAxRkYpOyAvLyBob3Jpem9udGFs L3ZlcnRpY2FsIGp1c3RpZmljYXRpb24gKDJ4IGludDhfdCkKICAgICBieXRlc3RyZWFtX3B1dF9i ZTMyKCZwLCBiYWNrX2NvbG9yKTsKICAgICBieXRlc3RyZWFtX3B1dF9iZTY0KCZwLCAwKTsgLy8g Qm94UmVjb3JkIC0gNHhpbnQxNl90OiB0b3AsIGxlZnQsIGJvdHRvbSwgcmlnaHQKLS0gCjIuMjUu MQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KZmZtcGVn LWRldmVsIG1haWxpbmcgbGlzdApmZm1wZWctZGV2ZWxAZmZtcGVnLm9yZwpodHRwczovL2ZmbXBl Zy5vcmcvbWFpbG1hbi9saXN0aW5mby9mZm1wZWctZGV2ZWwKClRvIHVuc3Vic2NyaWJlLCB2aXNp dCBsaW5rIGFib3ZlLCBvciBlbWFpbApmZm1wZWctZGV2ZWwtcmVxdWVzdEBmZm1wZWcub3JnIHdp dGggc3ViamVjdCAidW5zdWJzY3JpYmUiLgo=