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 51DA043B62 for ; Mon, 18 Jul 2022 20:01:18 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B11EB68B9DB; Mon, 18 Jul 2022 23:01:10 +0300 (EEST) Received: from mail-wr1-f41.google.com (mail-wr1-f41.google.com [209.85.221.41]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 54A0B68B8C9 for ; Mon, 18 Jul 2022 23:01:04 +0300 (EEST) Received: by mail-wr1-f41.google.com with SMTP id d16so18583854wrv.10 for ; Mon, 18 Jul 2022 13:01:04 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=3MT5kfgxc3FnoZxMGAnfhEY4iQseG9ZKejmBhTDlcG0=; b=7lEKXfw1zRFOJtGFXytXeJKkK5uIpWyt9AM6XesdIQ1/J78OMI6nCdcFU0QTlz4lc6 NXHK7FNj8O3R8VoGKVINAT7lK5tha2jWgNIEfSIhyQUrn0yXXoEZxJ8Z5/fRuDDfzUNq ypoU6XdGJ7l4oz/KIJwxpV+cwzqKwOBBKYEN//Gwbq/y5MTpkjQiHfuq0NayvdfttTt2 SxQj334V6zEv4dpCeNt2ep8XX8pErbrMjbG9TKr4q/1nN4JY51l2EqUH7lG66ghoin++ wUeldKeSydJhf88WwdqEEejAixS3NuJEYfZbcSeCcY8sT8zwtpHSFOyOeA+MQWRarg5l Gi8w== X-Gm-Message-State: AJIora9d6s7oTXxfyJuODIDQxCgLk+pk9IKr3varh5C7gPsfDtcaQnb8 nDPmaCOQUBGLyY7PHcGGxjvuz/h+Yh4X7g== X-Google-Smtp-Source: AGRyM1smhhlhiTR+h/4qFzHJsDiv42o1k5gIXDpD6lHmhpTqVt0AN7YXKlKhkWRvVLwNH0OVJGTfLQ== X-Received: by 2002:adf:f78b:0:b0:21d:6fef:f4e1 with SMTP id q11-20020adff78b000000b0021d6feff4e1mr23646464wrp.92.1658174463282; Mon, 18 Jul 2022 13:01:03 -0700 (PDT) Received: from localhost.localdomain ([84.71.185.98]) by smtp.gmail.com with ESMTPSA id k21-20020a05600c1c9500b003a3187a2d4csm6893220wms.22.2022.07.18.13.01.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Jul 2022 13:01:02 -0700 (PDT) From: facefunk To: ffmpeg-devel@ffmpeg.org Date: Mon, 18 Jul 2022 21:00:52 +0100 Message-Id: <20220718200052.159293-2-facefunk@fcfnk.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220718200052.159293-1-facefunk@fcfnk.com> References: <20220718160833.12397-2-facefunk@fcfnk.com> <20220718200052.159293-1-facefunk@fcfnk.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v3] 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 Cc: facefunk 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+Ci0tLQogZmZ0b29scy9mZm1wZWdfb3B0LmMgICAgfCAgNSArKysr KwogbGliYXZjb2RlYy9hdmNvZGVjLmggICAgfCAxMSArKysrKysrKysrKwogbGliYXZjb2RlYy9t b3Z0ZXh0ZW5jLmMgfCA0MSArKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysr LQogMyBmaWxlcyBjaGFuZ2VkLCA1NiBpbnNlcnRpb25zKCspLCAxIGRlbGV0aW9uKC0pCgpkaWZm IC0tZ2l0IGEvZmZ0b29scy9mZm1wZWdfb3B0LmMgYi9mZnRvb2xzL2ZmbXBlZ19vcHQuYwppbmRl eCBlMDg0NTU0NzhmLi5hN2ZhODA5ODU5IDEwMDY0NAotLS0gYS9mZnRvb2xzL2ZmbXBlZ19vcHQu YworKysgYi9mZnRvb2xzL2ZmbXBlZ19vcHQuYwpAQCAtMjI0NCw2ICsyMjQ0LDExIEBAIHN0YXRp YyBpbnQgc2V0X2Rpc3Bvc2l0aW9ucyhPdXRwdXRGaWxlICpvZiwgQVZGb3JtYXRDb250ZXh0ICpj dHgpCiAKICAgICAgICAgICAgIGlmIChyZXQgPCAwKQogICAgICAgICAgICAgICAgIHJldHVybiBy ZXQ7CisKKyAgICAgICAgICAgIC8vIEZvciBvdXRwdXQgc3RyZWFtcywgU2V0IHN1YnRpdGxlIGZs YWdzIHRvIGZvcmNlZCB3aGVuIHN0cmVhbQorICAgICAgICAgICAgLy8gZGlzcG9zaXRpb24gaXMg Zm9yY2VkLgorICAgICAgICAgICAgaWYob3N0LT5lbmNfY3R4ICYmIG9zdC0+c3QtPmRpc3Bvc2l0 aW9uICYgQVZfRElTUE9TSVRJT05fRk9SQ0VEKQorICAgICAgICAgICAgICAgIG9zdC0+ZW5jX2N0 eC0+c3VidGl0bGVfZmxhZ3MgfD0gQVZfU1VCVElUTEVfRkxBR19GT1JDRUQ7CiAgICAgICAgIH0K ICAgICB9IGVsc2UgewogICAgICAgICAvLyBGb3IgZWFjaCBtZWRpYSB0eXBlIHdpdGggbW9yZSB0 aGFuIG9uZSBzdHJlYW0sIGZpbmQgYSBzdWl0YWJsZSBzdHJlYW0gdG8KZGlmZiAtLWdpdCBhL2xp YmF2Y29kZWMvYXZjb2RlYy5oIGIvbGliYXZjb2RlYy9hdmNvZGVjLmgKaW5kZXggY2I1YzI1YmY2 My4uMTgyZjQ1MjU1NyAxMDA2NDQKLS0tIGEvbGliYXZjb2RlYy9hdmNvZGVjLmgKKysrIGIvbGli YXZjb2RlYy9hdmNvZGVjLmgKQEAgLTIwNTQsNiArMjA1NCwxNyBAQCB0eXBlZGVmIHN0cnVjdCBB VkNvZGVjQ29udGV4dCB7CiAgICAgICogICAgICAgICAgICAgVGhlIGRlY29kZXIgY2FuIHRoZW4g b3ZlcnJpZGUgZHVyaW5nIGRlY29kaW5nIGFzIG5lZWRlZC4KICAgICAgKi8KICAgICBBVkNoYW5u ZWxMYXlvdXQgY2hfbGF5b3V0OworCisgICAgLyoqCisgICAgICogU3VidGl0bGUgY29kZWNzIG9u bHkuIEJpdCBzZXQgb2YgQVZfU1VCVElUTEVfRkxBR18qLgorICAgICAqCisgICAgICogU29tZSBz dWJ0aXRsZSBjb2RlY3MgbWF5IHVzZSB0aGlzIGZpZWxkIHRvIGRldGVybWluZSB0aGUgc3VidGl0 bGUKKyAgICAgKiBkaXNwbGF5IGZsYWdzIHRvIGVuY29kZS4KKyAgICAgKgorICAgICAqIC0gZW5j b2Rpbmc6IHNldCBieSB1c2VyCisgICAgICogLSBkZWNvZGluZzogdW51c2VkCisgICAgICovCisg ICAgaW50IHN1YnRpdGxlX2ZsYWdzOwogfSBBVkNvZGVjQ29udGV4dDsKIAogLyoqCmRpZmYgLS1n aXQgYS9saWJhdmNvZGVjL21vdnRleHRlbmMuYyBiL2xpYmF2Y29kZWMvbW92dGV4dGVuYy5jCmlu ZGV4IDcyODMzOGYyY2MuLmJiNjAyMWY2ZDEgMTAwNjQ0Ci0tLSBhL2xpYmF2Y29kZWMvbW92dGV4 dGVuYy5jCisrKyBiL2xpYmF2Y29kZWMvbW92dGV4dGVuYy5jCkBAIC01MCw2ICs1MCw0MCBAQAog I2RlZmluZSBGT05UU0laRV9TQ0FMRShzLGZzKSAoKGZzKSAqIChzKS0+Zm9udF9zY2FsZV9mYWN0 b3IgKyAwLjUpCiAjZGVmaW5lIGF2X2JwcmludF9hcHBlbmRfYW55KGJ1ZiwgZGF0YSwgc2l6ZSkg ICBhdl9icHJpbnRfYXBwZW5kX2RhdGEoYnVmLCAoKGNvbnN0IGNoYXIqKWRhdGEpLCBzaXplKQog CisvKioKKyAqIGh0dHBzOi8vZGV2ZWxvcGVyLmFwcGxlLmNvbS9saWJyYXJ5L2FyY2hpdmUvZG9j dW1lbnRhdGlvbi9RdWlja1RpbWUvUVRGRi9RVEZGQ2hhcDMvcXRmZjMuaHRtbAorICoKKyAqIERp c3BsYXkgZmxhZ3MKKyAqIEEgMzItYml0IGludGVnZXIgY29udGFpbmluZyBmbGFncyB0aGF0IGRl c2NyaWJlIGhvdyB0aGUgc3VidGl0bGUgdGV4dCBzaG91bGQKKyAqIGJlIGRyYXduLgorICogVGhl IGZvbGxvd2luZyBmbGFncyBhcmUgZGVmaW5lZDoKKyAqCisgKiBWZXJ0aWNhbCBwbGFjZW1lbnQK KyAqIENvbnRyb2xzIHZlcnRpY2FsIHBsYWNlbWVudCBvZiB0aGUgc3VidGl0bGUgdGV4dC4KKyAq IElmIHRoaXMgZmxhZyBpcyBzZXQsIHRoZSBzdWJ0aXRsZSBtZWRpYSBoYW5kbGVyIHVzZXMgdGhl IHRvcCBjb29yZGluYXRlIG9mCisgKiB0aGUgZGlzcGxheSBib3VuZHMgb2YgdGhlIG92ZXJyaWRl ICd0Ym94JyB0ZXh0IGJveCB0byBkZXRlcm1pbmUgdGhlCisgKiBzdWJ0aXRsZeKAmXMgdmVydGlj YWwgcGxhY2VtZW50IGFzIGRlc2NyaWJlZCBpbiBTdWJ0aXRsZSBUcmFjayBIZWFkZXIgU2l6ZQor ICogYW5kIFBsYWNlbWVudC4gT3RoZXJ3aXNlLCB0aGUgc3VidGl0bGUgZGlzcGxheXMgYXQgdGhl IGJvdHRvbSBvZiB0aGUgdmlkZW8uCisgKi8KKyNkZWZpbmUgRElTUExBWV9GTEFHX1ZFUlRJQ0FM X1BMQUNFTUVOVF9UT1AgMHgyMDAwMDAwMAorCisvKioKKyAqIFNvbWUgc2FtcGxlcyBhcmUgZm9y Y2VkCisgKiBJbmRpY2F0ZXMgd2hldGhlciBhbnkgc3VidGl0bGUgc2FtcGxlcyBjb250YWluIGZv cmNlZCBhdG9tcy4gSWYgdGhpcyBmbGFnIGlzCisgKiBzZXQsIGF0IGxlYXN0IG9uZSBzYW1wbGUg Y29udGFpbnMgYSBmb3JjZWQgKCdmcmNkJykgYXRvbSBhcyBkZXNjcmliZWQgaW4KKyAqIFN1YnRp dGxlIFNhbXBsZSBEYXRhLgorICovCisjZGVmaW5lIERJU1BMQVlfRkxBR19TT01FX1NBTVBMRVNf Rk9SQ0VEICAgIDB4NDAwMDAwMDAKKworLyoqCisgKiBBbGwgc2FtcGxlcyBhcmUgZm9yY2VkCisg KiBJZiB0aGlzIGZsYWcgaXMgc2V0LCB0aGUgc3VidGl0bGUgbWVkaWEgaGFuZGxlciB0cmVhdHMg YWxsIHNhbXBsZXMgYXMgZm9yY2VkCisgKiBzdWJ0aXRsZXMsIHJlZ2FyZGxlc3Mgb2YgdGhlIHBy ZXNlbmNlIG9yIGFic2VuY2Ugb2YgYSAnZnJjZCcgYXRvbS4KKyAqIElmIHRoaXMgZmxhZyBpcyBz ZXQsIHRoZSBTb21lIFNhbXBsZXMgQXJlIEZvcmNlZCBmbGFnIG11c3QgYWxzbyBiZSBzZXQKKyAq IChtYWtpbmcgMHhDMDAwMDAwMCkuCisgKi8KKyNkZWZpbmUgRElTUExBWV9GTEFHX0FMTF9TQU1Q TEVTX0ZPUkNFRCAgICAgMHg4MDAwMDAwMAorCiB0eXBlZGVmIHN0cnVjdCB7CiAgICAgdWludDE2 X3Qgc3R5bGVfc3RhcnQ7CiAgICAgdWludDE2X3Qgc3R5bGVfZW5kOwpAQCAtMTgzLDYgKzIxNyw3 IEBAIHN0YXRpYyBpbnQgZW5jb2RlX3NhbXBsZV9kZXNjcmlwdGlvbihBVkNvZGVjQ29udGV4dCAq YXZjdHgpCiAgICAgaW50IGZvbnRfbmFtZXNfdG90YWxfbGVuID0gMDsKICAgICBNb3ZUZXh0Q29u dGV4dCAqcyA9IGF2Y3R4LT5wcml2X2RhdGE7CiAgICAgdWludDhfdCBidWZbMzBdLCAqcCA9IGJ1 ZjsKKyAgICB1aW50MzJfdCBkaXNwbGF5X2ZsYWdzID0gMDsKIAogICAgIC8vICAweDAwLCAweDAw LCAweDAwLCAweDAwLCAvLyB1aW50MzJfdCBkaXNwbGF5RmxhZ3MKICAgICAvLyAgMHgwMSwgICAg ICAgICAgICAgICAgICAgLy8gaW50OF90IGhvcml6b250YWwtanVzdGlmaWNhdGlvbgpAQCAtMjQx LDcgKzI3NiwxMSBAQCBzdGF0aWMgaW50IGVuY29kZV9zYW1wbGVfZGVzY3JpcHRpb24oQVZDb2Rl Y0NvbnRleHQgKmF2Y3R4KQogICAgICAgICAgICAgICAgICAgICAgKDI1NSAtICgodWludDMyX3Qp c3R5bGUtPmJhY2tfY29sb3IgPj4gMjQpKTsKICAgICB9CiAKLSAgICBieXRlc3RyZWFtX3B1dF9i ZTMyKCZwLCAwKTsgLy8gZGlzcGxheUZsYWdzCisgICAgaWYgKGF2Y3R4LT5zdWJ0aXRsZV9mbGFn cyAmIEFWX1NVQlRJVExFX0ZMQUdfRk9SQ0VEKQorICAgICAgICBkaXNwbGF5X2ZsYWdzID0gRElT UExBWV9GTEFHX1NPTUVfU0FNUExFU19GT1JDRUQgfAorICAgICAgICAgICAgRElTUExBWV9GTEFH X0FMTF9TQU1QTEVTX0ZPUkNFRDsKKworICAgIGJ5dGVzdHJlYW1fcHV0X2JlMzIoJnAsIGRpc3Bs YXlfZmxhZ3MpOyAvLyBkaXNwbGF5RmxhZ3MKICAgICBieXRlc3RyZWFtX3B1dF9iZTE2KCZwLCAw eDAxRkYpOyAvLyBob3Jpem9udGFsL3ZlcnRpY2FsIGp1c3RpZmljYXRpb24gKDJ4IGludDhfdCkK ICAgICBieXRlc3RyZWFtX3B1dF9iZTMyKCZwLCBiYWNrX2NvbG9yKTsKICAgICBieXRlc3RyZWFt X3B1dF9iZTY0KCZwLCAwKTsgLy8gQm94UmVjb3JkIC0gNHhpbnQxNl90OiB0b3AsIGxlZnQsIGJv dHRvbSwgcmlnaHQKLS0gCjIuMjUuMQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX18KZmZtcGVnLWRldmVsIG1haWxpbmcgbGlzdApmZm1wZWctZGV2ZWxAZmZt cGVnLm9yZwpodHRwczovL2ZmbXBlZy5vcmcvbWFpbG1hbi9saXN0aW5mby9mZm1wZWctZGV2ZWwK ClRvIHVuc3Vic2NyaWJlLCB2aXNpdCBsaW5rIGFib3ZlLCBvciBlbWFpbApmZm1wZWctZGV2ZWwt cmVxdWVzdEBmZm1wZWcub3JnIHdpdGggc3ViamVjdCAidW5zdWJzY3JpYmUiLgo=