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 8F31746435 for ; Thu, 18 May 2023 10:18:19 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5863668C155; Thu, 18 May 2023 13:18:16 +0300 (EEST) Received: from mail-vk1-f174.google.com (mail-vk1-f174.google.com [209.85.221.174]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8DE0D68C07A for ; Thu, 18 May 2023 13:18:09 +0300 (EEST) Received: by mail-vk1-f174.google.com with SMTP id 71dfb90a1353d-452f92680ecso608137e0c.1 for ; Thu, 18 May 2023 03:18:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1684405088; x=1686997088; h=to:subject:message-id:date:from:mime-version:from:to:cc:subject :date:message-id:reply-to; bh=F1gbmXkmbI9FVeZWevV8gk3epGP87zy1RAiF5JZBzMk=; b=mOHBn4Ys2689jUZm8KREhiUFg7nq8BrGxI+pPa7mpm7VZRMQDAUN3oSVay0fl3gfl0 ztl57lysuYIqlQpZKhsFrLTHO0Fw34qJWfXXOkByELQ06vmO/UIBjUUn0KZnFqP/t45x T1M96Xl8v7qhLFbz1u96TD3K3eUyCkvhgGclcY+EOLjViuCNiQuh5BOf3MvnXOATFbfT zNY3OD/pBVqpKEJKD14yPwyxVqeyxittLDadA0COmwVtWr0ndDIaYxb2oIAuUks0mlFD xHl2utB+UMPmhyRIDCGqeE9mY6H1FC9KODoUVxtPXw/5kF3exxF41lHa6v+sStWbix1W 7fKQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684405088; x=1686997088; h=to:subject:message-id:date:from:mime-version:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=F1gbmXkmbI9FVeZWevV8gk3epGP87zy1RAiF5JZBzMk=; b=WKmYwsnSwmhzieRgu4yK+aENjuPF1IgwkOuKOYEnE3xDSebGmWnAi/ZjjUGOwNPhqV Xtcr9OeADUZwUVlI4XyCFlhRSjGempuhFLjNiVi9pCSZ++KxKpmntYdqOrFgqfhTtDga 8t0dTj4DGA6rHBzCWYtUXM2xz+8xCzNX1dzMwUeAxLME5hb46jWVrUl6qjAhjEtjgZGu 3K7eYnsh4UFOL+CvvXkYcJ0avt5ksFyy45AhYnVoLlctehehSkBPJsHWMZQ1ENfy3gYh oMPw6juK5sSN9EuktxUGoicDcsg55U7IunL+NVvzjlP8Gry1D3Kcg87i35x2wbi91a89 h+xw== X-Gm-Message-State: AC+VfDzJjKU11UrzCpIHoZXo6CHh14UW9ntYVdFCe9TVHyXMOeQXtR+P St5kczjNpveca+0WWI+FoKBIC832zcRIXOGo0LjmbZnu X-Google-Smtp-Source: ACHHUZ4/G7MZqpIzRet1lyZ5oCXqZyE39AWF/Afera/NLjmKpCC2/DPuYNOxb+5q9X8vD6hUN9fSYTpzNhu6SRWGz8A= X-Received: by 2002:a1f:4391:0:b0:440:3ef7:35ba with SMTP id q139-20020a1f4391000000b004403ef735bamr390527vka.13.1684405088043; Thu, 18 May 2023 03:18:08 -0700 (PDT) MIME-Version: 1.0 From: Paul B Mahol Date: Thu, 18 May 2023 12:17:29 +0200 Message-ID: To: FFmpeg development discussions and patches Content-Type: multipart/mixed; boundary="000000000000ee629a05fbf51e12" X-Content-Filtered-By: Mailman/MimeDel 2.1.29 Subject: [FFmpeg-devel] [PATCH] avfilter/trim: switch to activate 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: --000000000000ee629a05fbf51e12 Content-Type: text/plain; charset="UTF-8" To provide EOF pts and also signal EOF to its inputs when dropping all remaining frames. Attached. --000000000000ee629a05fbf51e12 Content-Type: text/x-patch; charset="US-ASCII"; name="0018-avfilter-trim-switch-to-activate.patch" Content-Disposition: attachment; filename="0018-avfilter-trim-switch-to-activate.patch" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_lhsz8e3h0 RnJvbSA2YWJhMDg4ZDRhOTk0ZjkwZWZlYzAxMzA4MDU2Njg0ZDUyYjA0ZjVkIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBQYXVsIEIgTWFob2wgPG9uZW1kYUBnbWFpbC5jb20+CkRhdGU6 IFdlZCwgMTcgTWF5IDIwMjMgMDA6NDY6MjkgKzAyMDAKU3ViamVjdDogW1BBVENIXSBhdmZpbHRl ci90cmltOiBzd2l0Y2ggdG8gYWN0aXZhdGUKClNpZ25lZC1vZmYtYnk6IFBhdWwgQiBNYWhvbCA8 b25lbWRhQGdtYWlsLmNvbT4KLS0tCiBsaWJhdmZpbHRlci90cmltLmMgfCAyMTQgKysrKysrKysr KysrKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgMTMx IGluc2VydGlvbnMoKyksIDgzIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2xpYmF2ZmlsdGVy L3RyaW0uYyBiL2xpYmF2ZmlsdGVyL3RyaW0uYwppbmRleCBlZTZlODIxY2QyLi42YmI1Njc4Nzlk IDEwMDY0NAotLS0gYS9saWJhdmZpbHRlci90cmltLmMKKysrIGIvbGliYXZmaWx0ZXIvdHJpbS5j CkBAIC0zMSw2ICszMSw3IEBACiAjaW5jbHVkZSAiYXVkaW8uaCIKICNpbmNsdWRlICJhdmZpbHRl ci5oIgogI2luY2x1ZGUgImludGVybmFsLmgiCisjaW5jbHVkZSAiZmlsdGVycy5oIgogCiB0eXBl ZGVmIHN0cnVjdCBUcmltQ29udGV4dCB7CiAgICAgY29uc3QgQVZDbGFzcyAqY2xhc3M7CkBAIC02 OCw2ICs2OSw4IEBAIHR5cGVkZWYgc3RydWN0IFRyaW1Db250ZXh0IHsKICAgICBpbnQ2NF90IG5l eHRfcHRzOwogCiAgICAgaW50IGVvZjsKKworICAgIGludCAoKmZpbHRlcl9mcmFtZSkoQVZGaWx0 ZXJMaW5rICppbmxpbmssIEFWRnJhbWUgKmZyYW1lKTsKIH0gVHJpbUNvbnRleHQ7CiAKIHN0YXRp YyBhdl9jb2xkIGludCBpbml0KEFWRmlsdGVyQ29udGV4dCAqY3R4KQpAQCAtNzksNDcgKzgyLDYg QEAgc3RhdGljIGF2X2NvbGQgaW50IGluaXQoQVZGaWx0ZXJDb250ZXh0ICpjdHgpCiAgICAgcmV0 dXJuIDA7CiB9CiAKLXN0YXRpYyBpbnQgY29uZmlnX2lucHV0KEFWRmlsdGVyTGluayAqaW5saW5r KQotewotICAgIEFWRmlsdGVyQ29udGV4dCAqY3R4ID0gaW5saW5rLT5kc3Q7Ci0gICAgVHJpbUNv bnRleHQgICAgICAgKnMgPSBjdHgtPnByaXY7Ci0gICAgQVZSYXRpb25hbCB0YiA9IChpbmxpbmst PnR5cGUgPT0gQVZNRURJQV9UWVBFX1ZJREVPKSA/Ci0gICAgICAgICAgICAgICAgICAgICBpbmxp bmstPnRpbWVfYmFzZSA6IChBVlJhdGlvbmFsKXsgMSwgaW5saW5rLT5zYW1wbGVfcmF0ZSB9Owot Ci0gICAgaWYgKHMtPnN0YXJ0X3RpbWUgIT0gSU5UNjRfTUFYKSB7Ci0gICAgICAgIGludDY0X3Qg c3RhcnRfcHRzID0gYXZfcmVzY2FsZV9xKHMtPnN0YXJ0X3RpbWUsIEFWX1RJTUVfQkFTRV9RLCB0 Yik7Ci0gICAgICAgIGlmIChzLT5zdGFydF9wdHMgPT0gQVZfTk9QVFNfVkFMVUUgfHwgc3RhcnRf cHRzIDwgcy0+c3RhcnRfcHRzKQotICAgICAgICAgICAgcy0+c3RhcnRfcHRzID0gc3RhcnRfcHRz OwotICAgIH0KLSAgICBpZiAocy0+ZW5kX3RpbWUgIT0gSU5UNjRfTUFYKSB7Ci0gICAgICAgIGlu dDY0X3QgZW5kX3B0cyA9IGF2X3Jlc2NhbGVfcShzLT5lbmRfdGltZSwgQVZfVElNRV9CQVNFX1Es IHRiKTsKLSAgICAgICAgaWYgKHMtPmVuZF9wdHMgPT0gQVZfTk9QVFNfVkFMVUUgfHwgZW5kX3B0 cyA+IHMtPmVuZF9wdHMpCi0gICAgICAgICAgICBzLT5lbmRfcHRzID0gZW5kX3B0czsKLSAgICB9 Ci0gICAgaWYgKHMtPmR1cmF0aW9uKQotICAgICAgICBzLT5kdXJhdGlvbl90YiA9IGF2X3Jlc2Nh bGVfcShzLT5kdXJhdGlvbiwgQVZfVElNRV9CQVNFX1EsIHRiKTsKLQotICAgIHJldHVybiAwOwot fQotCi0jZGVmaW5lIE9GRlNFVCh4KSBvZmZzZXRvZihUcmltQ29udGV4dCwgeCkKLSNkZWZpbmUg Q09NTU9OX09QVFMgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBcCi0gICAg eyAic3RhcnQiLCAgICAgICAiVGltZXN0YW1wIG9mIHRoZSBmaXJzdCBmcmFtZSB0aGF0ICIgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFwKLSAgICAgICAgInNo b3VsZCBiZSBwYXNzZWQiLCAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICBPRkZTRVQoc3RhcnRfdGltZSksICBBVl9PUFRfVFlQRV9EVVJBVElPTiwgeyAuaTY0ID0g SU5UNjRfTUFYIH0sICAgIElOVDY0X01JTiwgSU5UNjRfTUFYLCBGTEFHUyB9LCBcCi0gICAgeyAi c3RhcnRpIiwgICAgICAiVGltZXN0YW1wIG9mIHRoZSBmaXJzdCBmcmFtZSB0aGF0ICIgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFwKLSAgICAgICAgInNob3Vs ZCBiZSBwYXNzZWQiLCAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICBPRkZTRVQoc3RhcnRfdGltZSksICBBVl9PUFRfVFlQRV9EVVJBVElPTiwgeyAuaTY0ID0gSU5U NjRfTUFYIH0sICAgIElOVDY0X01JTiwgSU5UNjRfTUFYLCBGTEFHUyB9LCBcCi0gICAgeyAiZW5k IiwgICAgICAgICAiVGltZXN0YW1wIG9mIHRoZSBmaXJzdCBmcmFtZSB0aGF0ICIgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFwKLSAgICAgICAgInNob3VsZCBi ZSBkcm9wcGVkIGFnYWluIiwgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBP RkZTRVQoZW5kX3RpbWUpLCAgICBBVl9PUFRfVFlQRV9EVVJBVElPTiwgeyAuaTY0ID0gSU5UNjRf TUFYIH0sICAgIElOVDY0X01JTiwgSU5UNjRfTUFYLCBGTEFHUyB9LCBcCi0gICAgeyAiZW5kaSIs ICAgICAgICAiVGltZXN0YW1wIG9mIHRoZSBmaXJzdCBmcmFtZSB0aGF0ICIgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFwKLSAgICAgICAgInNob3VsZCBiZSBk cm9wcGVkIGFnYWluIiwgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBPRkZT RVQoZW5kX3RpbWUpLCAgICBBVl9PUFRfVFlQRV9EVVJBVElPTiwgeyAuaTY0ID0gSU5UNjRfTUFY IH0sICAgIElOVDY0X01JTiwgSU5UNjRfTUFYLCBGTEFHUyB9LCBcCi0gICAgeyAic3RhcnRfcHRz IiwgICAiVGltZXN0YW1wIG9mIHRoZSBmaXJzdCBmcmFtZSB0aGF0IHNob3VsZCBiZSAiICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgXAotICAgICAgICIgcGFz c2VkIiwgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIE9GRlNFVChzdGFydF9wdHMpLCAgIEFWX09QVF9UWVBFX0lOVDY0LCAgeyAuaTY0ID0gQVZf Tk9QVFNfVkFMVUUgfSwgSU5UNjRfTUlOLCBJTlQ2NF9NQVgsIEZMQUdTIH0sIFwKLSAgICB7ICJl bmRfcHRzIiwgICAgICJUaW1lc3RhbXAgb2YgdGhlIGZpcnN0IGZyYW1lIHRoYXQgc2hvdWxkIGJl ICIgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBcCi0gICAg ICAgICJkcm9wcGVkIGFnYWluIiwgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgT0ZGU0VUKGVuZF9wdHMpLCAgICAgQVZfT1BUX1RZUEVfSU5UNjQsICB7IC5p NjQgPSBBVl9OT1BUU19WQUxVRSB9LCBJTlQ2NF9NSU4sIElOVDY0X01BWCwgRkxBR1MgfSwgXAot ICAgIHsgImR1cmF0aW9uIiwgICAgIk1heGltdW0gZHVyYXRpb24gb2YgdGhlIG91dHB1dCIsICAg ICAgICAgICAgICAgICAgIE9GRlNFVChkdXJhdGlvbiksICAgIEFWX09QVF9UWVBFX0RVUkFUSU9O LCB7IC5pNjQgPSAwIH0sICAgICAgICAgICAgICAgICAgICAwLCBJTlQ2NF9NQVgsIEZMQUdTIH0s IFwKLSAgICB7ICJkdXJhdGlvbmkiLCAgICJNYXhpbXVtIGR1cmF0aW9uIG9mIHRoZSBvdXRwdXQi LCAgICAgICAgICAgICAgICAgICBPRkZTRVQoZHVyYXRpb24pLCAgICBBVl9PUFRfVFlQRV9EVVJB VElPTiwgeyAuaTY0ID0gMCB9LCAgICAgICAgICAgICAgICAgICAgMCwgSU5UNjRfTUFYLCBGTEFH UyB9LAotCi0KICNpZiBDT05GSUdfVFJJTV9GSUxURVIKIHN0YXRpYyBpbnQgdHJpbV9maWx0ZXJf ZnJhbWUoQVZGaWx0ZXJMaW5rICppbmxpbmssIEFWRnJhbWUgKmZyYW1lKQogewpAQCAtMTYxLDcg KzEyMyw4IEBAIHN0YXRpYyBpbnQgdHJpbV9maWx0ZXJfZnJhbWUoQVZGaWx0ZXJMaW5rICppbmxp bmssIEFWRnJhbWUgKmZyYW1lKQogCiAgICAgICAgIGlmIChkcm9wKSB7CiAgICAgICAgICAgICBz LT5lb2YgPSAxOwotICAgICAgICAgICAgZmZfYXZmaWx0ZXJfbGlua19zZXRfb3V0X3N0YXR1cyhp bmxpbmssIEFWRVJST1JfRU9GLCBBVl9OT1BUU19WQUxVRSk7CisgICAgICAgICAgICBmZl9pbmxp bmtfc2V0X3N0YXR1cyhpbmxpbmssIEFWRVJST1JfRU9GKTsKKyAgICAgICAgICAgIGZmX291dGxp bmtfc2V0X3N0YXR1cyhjdHgtPm91dHB1dHNbMF0sIEFWRVJST1JfRU9GLCBmcmFtZS0+cHRzKTsK ICAgICAgICAgICAgIGdvdG8gZHJvcDsKICAgICAgICAgfQogICAgIH0KQEAgLTE3MSw0OSArMTM0 LDEyIEBAIHN0YXRpYyBpbnQgdHJpbV9maWx0ZXJfZnJhbWUoQVZGaWx0ZXJMaW5rICppbmxpbmss IEFWRnJhbWUgKmZyYW1lKQogICAgIHJldHVybiBmZl9maWx0ZXJfZnJhbWUoY3R4LT5vdXRwdXRz WzBdLCBmcmFtZSk7CiAKIGRyb3A6CisgICAgaWYgKCFzLT5lb2YpCisgICAgICAgIGZmX2ZpbHRl cl9zZXRfcmVhZHkoY3R4LCAxMDApOwogICAgIHMtPm5iX2ZyYW1lcysrOwogICAgIGF2X2ZyYW1l X2ZyZWUoJmZyYW1lKTsKICAgICByZXR1cm4gMDsKIH0KLQotI2RlZmluZSBGTEFHUyBBVl9PUFRf RkxBR19WSURFT19QQVJBTSB8IEFWX09QVF9GTEFHX0ZJTFRFUklOR19QQVJBTQotc3RhdGljIGNv bnN0IEFWT3B0aW9uIHRyaW1fb3B0aW9uc1tdID0gewotICAgIENPTU1PTl9PUFRTCi0gICAgeyAi c3RhcnRfZnJhbWUiLCAiTnVtYmVyIG9mIHRoZSBmaXJzdCBmcmFtZSB0aGF0IHNob3VsZCBiZSBw YXNzZWQgIgotICAgICAgICAidG8gdGhlIG91dHB1dCIsICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIE9GRlNFVChzdGFydF9mcmFtZSksIEFWX09QVF9UWVBF X0lOVDY0LCAgeyAuaTY0ID0gLTEgfSwgICAgICAgLTEsIElOVDY0X01BWCwgRkxBR1MgfSwKLSAg ICB7ICJlbmRfZnJhbWUiLCAgICJOdW1iZXIgb2YgdGhlIGZpcnN0IGZyYW1lIHRoYXQgc2hvdWxk IGJlIGRyb3BwZWQgIgotICAgICAgICAiYWdhaW4iLCAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIE9GRlNFVChlbmRfZnJhbWUpLCAgIEFWX09Q VF9UWVBFX0lOVDY0LCAgeyAuaTY0ID0gSU5UNjRfTUFYIH0sIDAsIElOVDY0X01BWCwgRkxBR1Mg fSwKLSAgICB7IE5VTEwgfQotfTsKLSN1bmRlZiBGTEFHUwotCi1BVkZJTFRFUl9ERUZJTkVfQ0xB U1ModHJpbSk7Ci0KLXN0YXRpYyBjb25zdCBBVkZpbHRlclBhZCB0cmltX2lucHV0c1tdID0gewot ICAgIHsKLSAgICAgICAgLm5hbWUgICAgICAgICA9ICJkZWZhdWx0IiwKLSAgICAgICAgLnR5cGUg ICAgICAgICA9IEFWTUVESUFfVFlQRV9WSURFTywKLSAgICAgICAgLmZpbHRlcl9mcmFtZSA9IHRy aW1fZmlsdGVyX2ZyYW1lLAotICAgICAgICAuY29uZmlnX3Byb3BzID0gY29uZmlnX2lucHV0LAot ICAgIH0sCi19OwotCi1zdGF0aWMgY29uc3QgQVZGaWx0ZXJQYWQgdHJpbV9vdXRwdXRzW10gPSB7 Ci0gICAgewotICAgICAgICAubmFtZSAgICAgICAgID0gImRlZmF1bHQiLAotICAgICAgICAudHlw ZSAgICAgICAgID0gQVZNRURJQV9UWVBFX1ZJREVPLAotICAgIH0sCi19OwotCi1jb25zdCBBVkZp bHRlciBmZl92Zl90cmltID0gewotICAgIC5uYW1lICAgICAgICA9ICJ0cmltIiwKLSAgICAuZGVz Y3JpcHRpb24gPSBOVUxMX0lGX0NPTkZJR19TTUFMTCgiUGljayBvbmUgY29udGludW91cyBzZWN0 aW9uIGZyb20gdGhlIGlucHV0LCBkcm9wIHRoZSByZXN0LiIpLAotICAgIC5pbml0ICAgICAgICA9 IGluaXQsCi0gICAgLnByaXZfc2l6ZSAgID0gc2l6ZW9mKFRyaW1Db250ZXh0KSwKLSAgICAucHJp dl9jbGFzcyAgPSAmdHJpbV9jbGFzcywKLSAgICBGSUxURVJfSU5QVVRTKHRyaW1faW5wdXRzKSwK LSAgICBGSUxURVJfT1VUUFVUUyh0cmltX291dHB1dHMpLAotfTsKICNlbmRpZiAvLyBDT05GSUdf VFJJTV9GSUxURVIKIAogI2lmIENPTkZJR19BVFJJTV9GSUxURVIKQEAgLTI5MCw3ICsyMTYsOCBA QCBzdGF0aWMgaW50IGF0cmltX2ZpbHRlcl9mcmFtZShBVkZpbHRlckxpbmsgKmlubGluaywgQVZG cmFtZSAqZnJhbWUpCiAKICAgICAgICAgaWYgKGRyb3ApIHsKICAgICAgICAgICAgIHMtPmVvZiA9 IDE7Ci0gICAgICAgICAgICBmZl9hdmZpbHRlcl9saW5rX3NldF9vdXRfc3RhdHVzKGlubGluaywg QVZFUlJPUl9FT0YsIEFWX05PUFRTX1ZBTFVFKTsKKyAgICAgICAgICAgIGZmX2lubGlua19zZXRf c3RhdHVzKGlubGluaywgQVZFUlJPUl9FT0YpOworICAgICAgICAgICAgZmZfb3V0bGlua19zZXRf c3RhdHVzKGN0eC0+b3V0cHV0c1swXSwgQVZFUlJPUl9FT0YsIGZyYW1lLT5wdHMpOwogICAgICAg ICAgICAgZ290byBkcm9wOwogICAgICAgICB9CiAgICAgfQpAQCAtMzI0LDEwICsyNTEsMTMxIEBA IHN0YXRpYyBpbnQgYXRyaW1fZmlsdGVyX2ZyYW1lKEFWRmlsdGVyTGluayAqaW5saW5rLCBBVkZy YW1lICpmcmFtZSkKICAgICByZXR1cm4gZmZfZmlsdGVyX2ZyYW1lKGN0eC0+b3V0cHV0c1swXSwg ZnJhbWUpOwogCiBkcm9wOgorICAgIGlmICghcy0+ZW9mKQorICAgICAgICBmZl9maWx0ZXJfc2V0 X3JlYWR5KGN0eCwgMTAwKTsKICAgICBzLT5uYl9zYW1wbGVzICs9IGZyYW1lLT5uYl9zYW1wbGVz OwogICAgIGF2X2ZyYW1lX2ZyZWUoJmZyYW1lKTsKICAgICByZXR1cm4gMDsKIH0KKyNlbmRpZiAv LyBDT05GSUdfQVRSSU1fRklMVEVSCisKK3N0YXRpYyBpbnQgY29uZmlnX2lucHV0KEFWRmlsdGVy TGluayAqaW5saW5rKQoreworICAgIEFWRmlsdGVyQ29udGV4dCAqY3R4ID0gaW5saW5rLT5kc3Q7 CisgICAgVHJpbUNvbnRleHQgICAgICAgKnMgPSBjdHgtPnByaXY7CisgICAgQVZSYXRpb25hbCB0 YiA9IChpbmxpbmstPnR5cGUgPT0gQVZNRURJQV9UWVBFX1ZJREVPKSA/CisgICAgICAgICAgICAg ICAgICAgICBpbmxpbmstPnRpbWVfYmFzZSA6IChBVlJhdGlvbmFsKXsgMSwgaW5saW5rLT5zYW1w bGVfcmF0ZSB9OworCisjaWYgQ09ORklHX1RSSU1fRklMVEVSCisgICAgaWYgKGlubGluay0+dHlw ZSA9PSBBVk1FRElBX1RZUEVfVklERU8pCisgICAgICAgIHMtPmZpbHRlcl9mcmFtZSA9IHRyaW1f ZmlsdGVyX2ZyYW1lOworI2VuZGlmCisjaWYgQ09ORklHX0FUUklNX0ZJTFRFUgorICAgIGlmIChp bmxpbmstPnR5cGUgPT0gQVZNRURJQV9UWVBFX0FVRElPKQorICAgICAgICBzLT5maWx0ZXJfZnJh bWUgPSBhdHJpbV9maWx0ZXJfZnJhbWU7CisjZW5kaWYKKyAgICBpZiAocy0+c3RhcnRfdGltZSAh PSBJTlQ2NF9NQVgpIHsKKyAgICAgICAgaW50NjRfdCBzdGFydF9wdHMgPSBhdl9yZXNjYWxlX3Eo cy0+c3RhcnRfdGltZSwgQVZfVElNRV9CQVNFX1EsIHRiKTsKKyAgICAgICAgaWYgKHMtPnN0YXJ0 X3B0cyA9PSBBVl9OT1BUU19WQUxVRSB8fCBzdGFydF9wdHMgPCBzLT5zdGFydF9wdHMpCisgICAg ICAgICAgICBzLT5zdGFydF9wdHMgPSBzdGFydF9wdHM7CisgICAgfQorICAgIGlmIChzLT5lbmRf dGltZSAhPSBJTlQ2NF9NQVgpIHsKKyAgICAgICAgaW50NjRfdCBlbmRfcHRzID0gYXZfcmVzY2Fs ZV9xKHMtPmVuZF90aW1lLCBBVl9USU1FX0JBU0VfUSwgdGIpOworICAgICAgICBpZiAocy0+ZW5k X3B0cyA9PSBBVl9OT1BUU19WQUxVRSB8fCBlbmRfcHRzID4gcy0+ZW5kX3B0cykKKyAgICAgICAg ICAgIHMtPmVuZF9wdHMgPSBlbmRfcHRzOworICAgIH0KKyAgICBpZiAocy0+ZHVyYXRpb24pCisg ICAgICAgIHMtPmR1cmF0aW9uX3RiID0gYXZfcmVzY2FsZV9xKHMtPmR1cmF0aW9uLCBBVl9USU1F X0JBU0VfUSwgdGIpOworCisgICAgcmV0dXJuIDA7Cit9CisKK3N0YXRpYyBpbnQgYWN0aXZhdGUo QVZGaWx0ZXJDb250ZXh0ICpjdHgpCit7CisgICAgVHJpbUNvbnRleHQgKnMgPSBjdHgtPnByaXY7 CisgICAgQVZGaWx0ZXJMaW5rICppbmxpbmsgPSBjdHgtPmlucHV0c1swXTsKKyAgICBBVkZpbHRl ckxpbmsgKm91dGxpbmsgPSBjdHgtPm91dHB1dHNbMF07CisKKyAgICBGRl9GSUxURVJfRk9SV0FS RF9TVEFUVVNfQkFDSyhvdXRsaW5rLCBpbmxpbmspOworCisgICAgaWYgKCFzLT5lb2YgJiYgZmZf aW5saW5rX3F1ZXVlZF9mcmFtZXMoaW5saW5rKSkgeworICAgICAgICBBVkZyYW1lICpmcmFtZSA9 IE5VTEw7CisgICAgICAgIGludCByZXQ7CisKKyAgICAgICAgcmV0ID0gZmZfaW5saW5rX2NvbnN1 bWVfZnJhbWUoaW5saW5rLCAmZnJhbWUpOworICAgICAgICBpZiAocmV0IDwgMCkKKyAgICAgICAg ICAgIHJldHVybiByZXQ7CisgICAgICAgIGlmIChyZXQgPiAwKQorICAgICAgICAgICAgcmV0dXJu IHMtPmZpbHRlcl9mcmFtZShpbmxpbmssIGZyYW1lKTsKKyAgICB9CisKKyAgICBGRl9GSUxURVJf Rk9SV0FSRF9TVEFUVVMoaW5saW5rLCBvdXRsaW5rKTsKKyAgICBGRl9GSUxURVJfRk9SV0FSRF9X QU5URUQob3V0bGluaywgaW5saW5rKTsKKworICAgIHJldHVybiBGRkVSUk9SX05PVF9SRUFEWTsK K30KKworI2RlZmluZSBPRkZTRVQoeCkgb2Zmc2V0b2YoVHJpbUNvbnRleHQsIHgpCisjZGVmaW5l IENPTU1PTl9PUFRTICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgXAorICAg IHsgInN0YXJ0IiwgICAgICAgIlRpbWVzdGFtcCBvZiB0aGUgZmlyc3QgZnJhbWUgdGhhdCAiICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBcCisgICAgICAgICJz aG91bGQgYmUgcGFzc2VkIiwgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgT0ZGU0VUKHN0YXJ0X3RpbWUpLCAgQVZfT1BUX1RZUEVfRFVSQVRJT04sIHsgLmk2NCA9 IElOVDY0X01BWCB9LCAgICBJTlQ2NF9NSU4sIElOVDY0X01BWCwgRkxBR1MgfSwgXAorICAgIHsg InN0YXJ0aSIsICAgICAgIlRpbWVzdGFtcCBvZiB0aGUgZmlyc3QgZnJhbWUgdGhhdCAiICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBcCisgICAgICAgICJzaG91 bGQgYmUgcGFzc2VkIiwgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgT0ZGU0VUKHN0YXJ0X3RpbWUpLCAgQVZfT1BUX1RZUEVfRFVSQVRJT04sIHsgLmk2NCA9IElO VDY0X01BWCB9LCAgICBJTlQ2NF9NSU4sIElOVDY0X01BWCwgRkxBR1MgfSwgXAorICAgIHsgImVu ZCIsICAgICAgICAgIlRpbWVzdGFtcCBvZiB0aGUgZmlyc3QgZnJhbWUgdGhhdCAiICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBcCisgICAgICAgICJzaG91bGQg YmUgZHJvcHBlZCBhZ2FpbiIsICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg T0ZGU0VUKGVuZF90aW1lKSwgICAgQVZfT1BUX1RZUEVfRFVSQVRJT04sIHsgLmk2NCA9IElOVDY0 X01BWCB9LCAgICBJTlQ2NF9NSU4sIElOVDY0X01BWCwgRkxBR1MgfSwgXAorICAgIHsgImVuZGki LCAgICAgICAgIlRpbWVzdGFtcCBvZiB0aGUgZmlyc3QgZnJhbWUgdGhhdCAiICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBcCisgICAgICAgICJzaG91bGQgYmUg ZHJvcHBlZCBhZ2FpbiIsICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgT0ZG U0VUKGVuZF90aW1lKSwgICAgQVZfT1BUX1RZUEVfRFVSQVRJT04sIHsgLmk2NCA9IElOVDY0X01B WCB9LCAgICBJTlQ2NF9NSU4sIElOVDY0X01BWCwgRkxBR1MgfSwgXAorICAgIHsgInN0YXJ0X3B0 cyIsICAgIlRpbWVzdGFtcCBvZiB0aGUgZmlyc3QgZnJhbWUgdGhhdCBzaG91bGQgYmUgIiAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFwKKyAgICAgICAiIHBh c3NlZCIsICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICBPRkZTRVQoc3RhcnRfcHRzKSwgICBBVl9PUFRfVFlQRV9JTlQ2NCwgIHsgLmk2NCA9IEFW X05PUFRTX1ZBTFVFIH0sIElOVDY0X01JTiwgSU5UNjRfTUFYLCBGTEFHUyB9LCBcCisgICAgeyAi ZW5kX3B0cyIsICAgICAiVGltZXN0YW1wIG9mIHRoZSBmaXJzdCBmcmFtZSB0aGF0IHNob3VsZCBi ZSAiICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgXAorICAg ICAgICAiZHJvcHBlZCBhZ2FpbiIsICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIE9GRlNFVChlbmRfcHRzKSwgICAgIEFWX09QVF9UWVBFX0lOVDY0LCAgeyAu aTY0ID0gQVZfTk9QVFNfVkFMVUUgfSwgSU5UNjRfTUlOLCBJTlQ2NF9NQVgsIEZMQUdTIH0sIFwK KyAgICB7ICJkdXJhdGlvbiIsICAgICJNYXhpbXVtIGR1cmF0aW9uIG9mIHRoZSBvdXRwdXQiLCAg ICAgICAgICAgICAgICAgICBPRkZTRVQoZHVyYXRpb24pLCAgICBBVl9PUFRfVFlQRV9EVVJBVElP TiwgeyAuaTY0ID0gMCB9LCAgICAgICAgICAgICAgICAgICAgMCwgSU5UNjRfTUFYLCBGTEFHUyB9 LCBcCisgICAgeyAiZHVyYXRpb25pIiwgICAiTWF4aW11bSBkdXJhdGlvbiBvZiB0aGUgb3V0cHV0 IiwgICAgICAgICAgICAgICAgICAgT0ZGU0VUKGR1cmF0aW9uKSwgICAgQVZfT1BUX1RZUEVfRFVS QVRJT04sIHsgLmk2NCA9IDAgfSwgICAgICAgICAgICAgICAgICAgIDAsIElOVDY0X01BWCwgRkxB R1MgfSwKKworCisjaWYgQ09ORklHX1RSSU1fRklMVEVSCisKKyNkZWZpbmUgRkxBR1MgQVZfT1BU X0ZMQUdfVklERU9fUEFSQU0gfCBBVl9PUFRfRkxBR19GSUxURVJJTkdfUEFSQU0KK3N0YXRpYyBj b25zdCBBVk9wdGlvbiB0cmltX29wdGlvbnNbXSA9IHsKKyAgICBDT01NT05fT1BUUworICAgIHsg InN0YXJ0X2ZyYW1lIiwgIk51bWJlciBvZiB0aGUgZmlyc3QgZnJhbWUgdGhhdCBzaG91bGQgYmUg cGFzc2VkICIKKyAgICAgICAgInRvIHRoZSBvdXRwdXQiLCAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICBPRkZTRVQoc3RhcnRfZnJhbWUpLCBBVl9PUFRfVFlQ RV9JTlQ2NCwgIHsgLmk2NCA9IC0xIH0sICAgICAgIC0xLCBJTlQ2NF9NQVgsIEZMQUdTIH0sCisg ICAgeyAiZW5kX2ZyYW1lIiwgICAiTnVtYmVyIG9mIHRoZSBmaXJzdCBmcmFtZSB0aGF0IHNob3Vs ZCBiZSBkcm9wcGVkICIKKyAgICAgICAgImFnYWluIiwgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBPRkZTRVQoZW5kX2ZyYW1lKSwgICBBVl9P UFRfVFlQRV9JTlQ2NCwgIHsgLmk2NCA9IElOVDY0X01BWCB9LCAwLCBJTlQ2NF9NQVgsIEZMQUdT IH0sCisgICAgeyBOVUxMIH0KK307CisjdW5kZWYgRkxBR1MKKworQVZGSUxURVJfREVGSU5FX0NM QVNTKHRyaW0pOworCitzdGF0aWMgY29uc3QgQVZGaWx0ZXJQYWQgdHJpbV9pbnB1dHNbXSA9IHsK KyAgICB7CisgICAgICAgIC5uYW1lICAgICAgICAgPSAiZGVmYXVsdCIsCisgICAgICAgIC50eXBl ICAgICAgICAgPSBBVk1FRElBX1RZUEVfVklERU8sCisgICAgICAgIC5jb25maWdfcHJvcHMgPSBj b25maWdfaW5wdXQsCisgICAgfSwKK307CisKK3N0YXRpYyBjb25zdCBBVkZpbHRlclBhZCB0cmlt X291dHB1dHNbXSA9IHsKKyAgICB7CisgICAgICAgIC5uYW1lICAgICAgICAgPSAiZGVmYXVsdCIs CisgICAgICAgIC50eXBlICAgICAgICAgPSBBVk1FRElBX1RZUEVfVklERU8sCisgICAgfSwKK307 CisKK2NvbnN0IEFWRmlsdGVyIGZmX3ZmX3RyaW0gPSB7CisgICAgLm5hbWUgICAgICAgID0gInRy aW0iLAorICAgIC5kZXNjcmlwdGlvbiA9IE5VTExfSUZfQ09ORklHX1NNQUxMKCJQaWNrIG9uZSBj b250aW51b3VzIHNlY3Rpb24gZnJvbSB0aGUgaW5wdXQsIGRyb3AgdGhlIHJlc3QuIiksCisgICAg LmluaXQgICAgICAgID0gaW5pdCwKKyAgICAuYWN0aXZhdGUgICAgPSBhY3RpdmF0ZSwKKyAgICAu cHJpdl9zaXplICAgPSBzaXplb2YoVHJpbUNvbnRleHQpLAorICAgIC5wcml2X2NsYXNzICA9ICZ0 cmltX2NsYXNzLAorICAgIEZJTFRFUl9JTlBVVFModHJpbV9pbnB1dHMpLAorICAgIEZJTFRFUl9P VVRQVVRTKHRyaW1fb3V0cHV0cyksCit9OworI2VuZGlmIC8vIENPTkZJR19UUklNX0ZJTFRFUgor CisjaWYgQ09ORklHX0FUUklNX0ZJTFRFUgogCiAjZGVmaW5lIEZMQUdTIEFWX09QVF9GTEFHX0FV RElPX1BBUkFNIHwgQVZfT1BUX0ZMQUdfRklMVEVSSU5HX1BBUkFNCiBzdGF0aWMgY29uc3QgQVZP cHRpb24gYXRyaW1fb3B0aW9uc1tdID0gewpAQCAtMzQ2LDcgKzM5NCw2IEBAIHN0YXRpYyBjb25z dCBBVkZpbHRlclBhZCBhdHJpbV9pbnB1dHNbXSA9IHsKICAgICB7CiAgICAgICAgIC5uYW1lICAg ICAgICAgPSAiZGVmYXVsdCIsCiAgICAgICAgIC50eXBlICAgICAgICAgPSBBVk1FRElBX1RZUEVf QVVESU8sCi0gICAgICAgIC5maWx0ZXJfZnJhbWUgPSBhdHJpbV9maWx0ZXJfZnJhbWUsCiAgICAg ICAgIC5jb25maWdfcHJvcHMgPSBjb25maWdfaW5wdXQsCiAgICAgfSwKIH07CkBAIC0zNjIsNiAr NDA5LDcgQEAgY29uc3QgQVZGaWx0ZXIgZmZfYWZfYXRyaW0gPSB7CiAgICAgLm5hbWUgICAgICAg ID0gImF0cmltIiwKICAgICAuZGVzY3JpcHRpb24gPSBOVUxMX0lGX0NPTkZJR19TTUFMTCgiUGlj ayBvbmUgY29udGludW91cyBzZWN0aW9uIGZyb20gdGhlIGlucHV0LCBkcm9wIHRoZSByZXN0LiIp LAogICAgIC5pbml0ICAgICAgICA9IGluaXQsCisgICAgLmFjdGl2YXRlICAgID0gYWN0aXZhdGUs CiAgICAgLnByaXZfc2l6ZSAgID0gc2l6ZW9mKFRyaW1Db250ZXh0KSwKICAgICAucHJpdl9jbGFz cyAgPSAmYXRyaW1fY2xhc3MsCiAgICAgLmZsYWdzICAgICAgID0gQVZGSUxURVJfRkxBR19NRVRB REFUQV9PTkxZLAotLSAKMi4zOS4xCgo= --000000000000ee629a05fbf51e12 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". --000000000000ee629a05fbf51e12--