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 2DF2F401BE for ; Mon, 18 Jul 2022 16:11:15 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7D42F68B7E0; Mon, 18 Jul 2022 19:11:13 +0300 (EEST) Received: from mail-wm1-f43.google.com (mail-wm1-f43.google.com [209.85.128.43]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1DAF868B7E0 for ; Mon, 18 Jul 2022 19:11:07 +0300 (EEST) Received: by mail-wm1-f43.google.com with SMTP id c187-20020a1c35c4000000b003a30d88fe8eso6045057wma.2 for ; Mon, 18 Jul 2022 09:11:07 -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=6ARa/p3KRzIxWQPofPzhXDoKOiz0H8zi08F9t+EI+uY=; b=IMh8QVovH3KKCE249FnppWD8ZxKqFNL6Mrx0xjT1EDgPNu0O0AevV6QZe2lqZ0cMzZ 5V/W/MYjuxrk4X3eE7iX9bCEnBJdyhXJkPYRUQePzgxoMrGVWm7AEMcT0m5XvJUPDdMR OgWH+cvvmzmji12VtfJmNhJi35dwOi+uUHCwguOpaFldAf1vvEI5xqQEPwwqzYD4eiw9 lGddNvwaxATkGWBVGiZL+FvvIA0VGFsEaq+ikiZSeBvHRuw93JPYsWp0/Ia22B8UR329 FfiKZ9wiFmZsXhh9eM8BLjnyFrVI8pJMYb5PokbMGqYTINLtrdSnYpCflnhOm+GLX3qT honQ== X-Gm-Message-State: AJIora8FmgaIO8RO3XHILM8CyAnNCjDJD52HW6+pnnI54E8JQMa1yp1O X7AjQOn6WlxKD3qjui93eyl6DvKDRgMUcg== X-Google-Smtp-Source: AGRyM1tOl3Fib4/Qh7JGWYZzhjs73BOJyXAEHfcaGVkS7JJF2ch+snTg8jRntWOTWpjzPx8KHqwVPA== X-Received: by 2002:a05:600c:4ed0:b0:3a0:5263:cf09 with SMTP id g16-20020a05600c4ed000b003a05263cf09mr27465603wmq.6.1658160666127; Mon, 18 Jul 2022 09:11:06 -0700 (PDT) Received: from localhost.localdomain ([84.71.185.98]) by smtp.gmail.com with ESMTPSA id co18-20020a0560000a1200b0021b5861eaf7sm11228737wrb.3.2022.07.18.09.11.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Jul 2022 09:11:05 -0700 (PDT) From: facefunk To: ffmpeg-devel@ffmpeg.org Date: Mon, 18 Jul 2022 17:08:31 +0100 Message-Id: <20220718160833.12397-2-facefunk@fcfnk.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220718160833.12397-1-facefunk@fcfnk.com> References: <20220717133256.35929-1-facefunk@fcfnk.com> <20220718160833.12397-1-facefunk@fcfnk.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/3] 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 KwogbGliYXZjb2RlYy9hdmNvZGVjLmggICAgfCAxNiArKysrKysrKysrKysrKysrCiBsaWJhdmNv ZGVjL21vdnRleHRlbmMuYyB8IDQxICsrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysr KysrKystCiAzIGZpbGVzIGNoYW5nZWQsIDYxIGluc2VydGlvbnMoKyksIDEgZGVsZXRpb24oLSkK CmRpZmYgLS1naXQgYS9mZnRvb2xzL2ZmbXBlZ19vcHQuYyBiL2ZmdG9vbHMvZmZtcGVnX29wdC5j CmluZGV4IGUwODQ1NTQ3OGYuLmQ4ZWExZDRiYzEgMTAwNjQ0Ci0tLSBhL2ZmdG9vbHMvZmZtcGVn X29wdC5jCisrKyBiL2ZmdG9vbHMvZmZtcGVnX29wdC5jCkBAIC0yMjQ0LDYgKzIyNDQsMTEgQEAg c3RhdGljIGludCBzZXRfZGlzcG9zaXRpb25zKE91dHB1dEZpbGUgKm9mLCBBVkZvcm1hdENvbnRl eHQgKmN0eCkKIAogICAgICAgICAgICAgaWYgKHJldCA8IDApCiAgICAgICAgICAgICAgICAgcmV0 dXJuIHJldDsKKworICAgICAgICAgICAgLy8gRm9yIG91dHB1dCBzdHJlYW1zLCBjb3B5IHN0cmVh bSBkaXNwb3NpdGlvbiB0byB0aGUgQVZDb2RlY0NvbnRleHQKKyAgICAgICAgICAgIC8vIG9iamVj dC4KKyAgICAgICAgICAgIGlmKG9zdC0+ZW5jX2N0eCkKKyAgICAgICAgICAgICAgICBvc3QtPmVu Y19jdHgtPnN0cmVhbV9kaXNwb3NpdGlvbiA9IG9zdC0+c3QtPmRpc3Bvc2l0aW9uOwogICAgICAg ICB9CiAgICAgfSBlbHNlIHsKICAgICAgICAgLy8gRm9yIGVhY2ggbWVkaWEgdHlwZSB3aXRoIG1v cmUgdGhhbiBvbmUgc3RyZWFtLCBmaW5kIGEgc3VpdGFibGUgc3RyZWFtIHRvCmRpZmYgLS1naXQg YS9saWJhdmNvZGVjL2F2Y29kZWMuaCBiL2xpYmF2Y29kZWMvYXZjb2RlYy5oCmluZGV4IGNiNWMy NWJmNjMuLmViMTFkZTAyOTMgMTAwNjQ0Ci0tLSBhL2xpYmF2Y29kZWMvYXZjb2RlYy5oCisrKyBi L2xpYmF2Y29kZWMvYXZjb2RlYy5oCkBAIC0zNyw2ICszNyw4IEBACiAjaW5jbHVkZSAibGliYXZ1 dGlsL3BpeGZtdC5oIgogI2luY2x1ZGUgImxpYmF2dXRpbC9yYXRpb25hbC5oIgogCisjaW5jbHVk ZSAibGliYXZmb3JtYXQvYXZmb3JtYXQuaCIKKwogI2luY2x1ZGUgImNvZGVjLmgiCiAjaW5jbHVk ZSAiY29kZWNfZGVzYy5oIgogI2luY2x1ZGUgImNvZGVjX3Bhci5oIgpAQCAtMjA1NCw2ICsyMDU2 LDIwIEBAIHR5cGVkZWYgc3RydWN0IEFWQ29kZWNDb250ZXh0IHsKICAgICAgKiAgICAgICAgICAg ICBUaGUgZGVjb2RlciBjYW4gdGhlbiBvdmVycmlkZSBkdXJpbmcgZGVjb2RpbmcgYXMgbmVlZGVk LgogICAgICAqLwogICAgIEFWQ2hhbm5lbExheW91dCBjaF9sYXlvdXQ7CisKKyAgICAvKioKKyAg ICAgKiBTdHJlYW0gZGlzcG9zaXRpb24gLSBhIGNvbWJpbmF0aW9uIG9mIEFWX0RJU1BPU0lUSU9O XyogZmxhZ3MgZnJvbQorICAgICAqIGxpYmF2Zm9ybWF0LgorICAgICAqCisgICAgICogQ29waWVk IGZyb20gdGhlIHJlbGV2YW50IEFWU3RyZWFtIG9iamVjdCBmb3IgY29kZWNzIHRoYXQgbmVlZCBh Y2Nlc3MgdG8KKyAgICAgKiB0aGUgc3RyZWFtIGRpc3Bvc2l0aW9uIHBhcmFtZXRlciwgc3VjaCBh cyBtb3Z0ZXh0ZW5jLmMgd2hpY2ggbmVlZHMgdG8KKyAgICAgKiByZWFkIHRoZSBBVl9ESVNQT1NJ VElPTl9GT1JDRUQgZmxhZyBzbyBpdCBrbm93cyB3aGVuIHRvIHNldCBmb3JjZWQKKyAgICAgKiBz dWJ0aXRsZXMuCisgICAgICoKKyAgICAgKiAtIGVuY29kaW5nOiBTZXQgYnkgc2V0X2Rpc3Bvc2l0 aW9ucyBpbiBmZm1wZWdfb3B0LmMuCisgICAgICogLSBkZWNvZGluZzogdW51c2VkCisgICAgICov CisgICAgaW50IHN0cmVhbV9kaXNwb3NpdGlvbjsKIH0gQVZDb2RlY0NvbnRleHQ7CiAKIC8qKgpk aWZmIC0tZ2l0IGEvbGliYXZjb2RlYy9tb3Z0ZXh0ZW5jLmMgYi9saWJhdmNvZGVjL21vdnRleHRl bmMuYwppbmRleCA3MjgzMzhmMmNjLi5kMjU1MDU4NWU4IDEwMDY0NAotLS0gYS9saWJhdmNvZGVj L21vdnRleHRlbmMuYworKysgYi9saWJhdmNvZGVjL21vdnRleHRlbmMuYwpAQCAtNTAsNiArNTAs NDAgQEAKICNkZWZpbmUgRk9OVFNJWkVfU0NBTEUocyxmcykgKChmcykgKiAocyktPmZvbnRfc2Nh bGVfZmFjdG9yICsgMC41KQogI2RlZmluZSBhdl9icHJpbnRfYXBwZW5kX2FueShidWYsIGRhdGEs IHNpemUpICAgYXZfYnByaW50X2FwcGVuZF9kYXRhKGJ1ZiwgKChjb25zdCBjaGFyKilkYXRhKSwg c2l6ZSkKIAorLyoqCisgKiBodHRwczovL2RldmVsb3Blci5hcHBsZS5jb20vbGlicmFyeS9hcmNo aXZlL2RvY3VtZW50YXRpb24vUXVpY2tUaW1lL1FURkYvUVRGRkNoYXAzL3F0ZmYzLmh0bWwKKyAq CisgKiBEaXNwbGF5IGZsYWdzCisgKiBBIDMyLWJpdCBpbnRlZ2VyIGNvbnRhaW5pbmcgZmxhZ3Mg dGhhdCBkZXNjcmliZSBob3cgdGhlIHN1YnRpdGxlIHRleHQgc2hvdWxkCisgKiBiZSBkcmF3bi4K KyAqIFRoZSBmb2xsb3dpbmcgZmxhZ3MgYXJlIGRlZmluZWQ6CisgKgorICogVmVydGljYWwgcGxh Y2VtZW50CisgKiBDb250cm9scyB2ZXJ0aWNhbCBwbGFjZW1lbnQgb2YgdGhlIHN1YnRpdGxlIHRl eHQuCisgKiBJZiB0aGlzIGZsYWcgaXMgc2V0LCB0aGUgc3VidGl0bGUgbWVkaWEgaGFuZGxlciB1 c2VzIHRoZSB0b3AgY29vcmRpbmF0ZSBvZgorICogdGhlIGRpc3BsYXkgYm91bmRzIG9mIHRoZSBv dmVycmlkZSAndGJveCcgdGV4dCBib3ggdG8gZGV0ZXJtaW5lIHRoZQorICogc3VidGl0bGXigJlz IHZlcnRpY2FsIHBsYWNlbWVudCBhcyBkZXNjcmliZWQgaW4gU3VidGl0bGUgVHJhY2sgSGVhZGVy IFNpemUKKyAqIGFuZCBQbGFjZW1lbnQuIE90aGVyd2lzZSwgdGhlIHN1YnRpdGxlIGRpc3BsYXlz IGF0IHRoZSBib3R0b20gb2YgdGhlIHZpZGVvLgorICovCisjZGVmaW5lIERJU1BMQVlfRkxBR19W RVJUSUNBTF9QTEFDRU1FTlRfVE9QIDB4MjAwMDAwMDAKKworLyoqCisgKiBTb21lIHNhbXBsZXMg YXJlIGZvcmNlZAorICogSW5kaWNhdGVzIHdoZXRoZXIgYW55IHN1YnRpdGxlIHNhbXBsZXMgY29u dGFpbiBmb3JjZWQgYXRvbXMuIElmIHRoaXMgZmxhZyBpcworICogc2V0LCBhdCBsZWFzdCBvbmUg c2FtcGxlIGNvbnRhaW5zIGEgZm9yY2VkICgnZnJjZCcpIGF0b20gYXMgZGVzY3JpYmVkIGluCisg KiBTdWJ0aXRsZSBTYW1wbGUgRGF0YS4KKyAqLworI2RlZmluZSBESVNQTEFZX0ZMQUdfU09NRV9T QU1QTEVTX0ZPUkNFRCAgICAweDQwMDAwMDAwCisKKy8qKgorICogQWxsIHNhbXBsZXMgYXJlIGZv cmNlZAorICogSWYgdGhpcyBmbGFnIGlzIHNldCwgdGhlIHN1YnRpdGxlIG1lZGlhIGhhbmRsZXIg dHJlYXRzIGFsbCBzYW1wbGVzIGFzIGZvcmNlZAorICogc3VidGl0bGVzLCByZWdhcmRsZXNzIG9m IHRoZSBwcmVzZW5jZSBvciBhYnNlbmNlIG9mIGEgJ2ZyY2QnIGF0b20uCisgKiBJZiB0aGlzIGZs YWcgaXMgc2V0LCB0aGUgU29tZSBTYW1wbGVzIEFyZSBGb3JjZWQgZmxhZyBtdXN0IGFsc28gYmUg c2V0CisgKiAobWFraW5nIDB4QzAwMDAwMDApLgorICovCisjZGVmaW5lIERJU1BMQVlfRkxBR19B TExfU0FNUExFU19GT1JDRUQgICAgIDB4ODAwMDAwMDAKKwogdHlwZWRlZiBzdHJ1Y3QgewogICAg IHVpbnQxNl90IHN0eWxlX3N0YXJ0OwogICAgIHVpbnQxNl90IHN0eWxlX2VuZDsKQEAgLTE4Myw2 ICsyMTcsNyBAQCBzdGF0aWMgaW50IGVuY29kZV9zYW1wbGVfZGVzY3JpcHRpb24oQVZDb2RlY0Nv bnRleHQgKmF2Y3R4KQogICAgIGludCBmb250X25hbWVzX3RvdGFsX2xlbiA9IDA7CiAgICAgTW92 VGV4dENvbnRleHQgKnMgPSBhdmN0eC0+cHJpdl9kYXRhOwogICAgIHVpbnQ4X3QgYnVmWzMwXSwg KnAgPSBidWY7CisgICAgdWludDMyX3QgZGlzcGxheV9mbGFncyA9IDA7CiAKICAgICAvLyAgMHgw MCwgMHgwMCwgMHgwMCwgMHgwMCwgLy8gdWludDMyX3QgZGlzcGxheUZsYWdzCiAgICAgLy8gIDB4 MDEsICAgICAgICAgICAgICAgICAgIC8vIGludDhfdCBob3Jpem9udGFsLWp1c3RpZmljYXRpb24K QEAgLTI0MSw3ICsyNzYsMTEgQEAgc3RhdGljIGludCBlbmNvZGVfc2FtcGxlX2Rlc2NyaXB0aW9u KEFWQ29kZWNDb250ZXh0ICphdmN0eCkKICAgICAgICAgICAgICAgICAgICAgICgyNTUgLSAoKHVp bnQzMl90KXN0eWxlLT5iYWNrX2NvbG9yID4+IDI0KSk7CiAgICAgfQogCi0gICAgYnl0ZXN0cmVh bV9wdXRfYmUzMigmcCwgMCk7IC8vIGRpc3BsYXlGbGFncworICAgIGlmIChhdmN0eC0+c3RyZWFt X2Rpc3Bvc2l0aW9uICYgQVZfRElTUE9TSVRJT05fRk9SQ0VEKQorICAgICAgICBkaXNwbGF5X2Zs YWdzID0gRElTUExBWV9GTEFHX1NPTUVfU0FNUExFU19GT1JDRUQgfAorICAgICAgICAgICAgRElT UExBWV9GTEFHX0FMTF9TQU1QTEVTX0ZPUkNFRDsKKworICAgIGJ5dGVzdHJlYW1fcHV0X2JlMzIo JnAsIGRpc3BsYXlfZmxhZ3MpOyAvLyBkaXNwbGF5RmxhZ3MKICAgICBieXRlc3RyZWFtX3B1dF9i ZTE2KCZwLCAweDAxRkYpOyAvLyBob3Jpem9udGFsL3ZlcnRpY2FsIGp1c3RpZmljYXRpb24gKDJ4 IGludDhfdCkKICAgICBieXRlc3RyZWFtX3B1dF9iZTMyKCZwLCBiYWNrX2NvbG9yKTsKICAgICBi eXRlc3RyZWFtX3B1dF9iZTY0KCZwLCAwKTsgLy8gQm94UmVjb3JkIC0gNHhpbnQxNl90OiB0b3As IGxlZnQsIGJvdHRvbSwgcmlnaHQKLS0gCjIuMjUuMQoKX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX18KZmZtcGVnLWRldmVsIG1haWxpbmcgbGlzdApmZm1wZWct ZGV2ZWxAZmZtcGVnLm9yZwpodHRwczovL2ZmbXBlZy5vcmcvbWFpbG1hbi9saXN0aW5mby9mZm1w ZWctZGV2ZWwKClRvIHVuc3Vic2NyaWJlLCB2aXNpdCBsaW5rIGFib3ZlLCBvciBlbWFpbApmZm1w ZWctZGV2ZWwtcmVxdWVzdEBmZm1wZWcub3JnIHdpdGggc3ViamVjdCAidW5zdWJzY3JpYmUiLgo=