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 A59F443843 for ; Thu, 30 Jun 2022 12:42:54 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id F04CA68B6DD; Thu, 30 Jun 2022 15:42:51 +0300 (EEST) Received: from mail.acc.umu.se (mail.acc.umu.se [130.239.18.156]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 293A168B45D for ; Thu, 30 Jun 2022 15:42:45 +0300 (EEST) Received: from localhost (localhost.localdomain [127.0.0.1]) by amavisd-new (Postfix) with ESMTP id 8AA2C44B96 for ; Thu, 30 Jun 2022 14:42:44 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=acc.umu.se; s=mail1; t=1656592964; bh=gvrTpkOJYc4XojrPITm0T6+7lwmI8g3e4FuFbM0HYh0=; h=Subject:From:To:Date:From; b=JmZ09TtiJ/ft4jtft36xhDl+V1W7RTlJ9T8aztCToyOQ4fEUlbfcTNEI6chz5hryk ddUiZ4jDzc1Lhz43br6iGp7nkWNmyD813wL86zJJ9bHfGMWkxUCkCSedoD2nwNleE0 iz6aQRGpdm95Tzv36Q5tUaAIoF+8V2sqPlHCKahLVyKXTrDUaXiZQs9ibFc+ROtjU4 h3OwjkMBki165svBt/36EJbmvEdFB7r0wLDJ8nZ2uoACSoaUwweWmq7r1yalIeLXPp Ywrfjrix8Sr2SmaFY5llZpi7y6PU9wQZV0Vl5Yt7PLlTfIrwa/8zA7lFTBCjlNKkxh ipUkGo+hkcx+A== Received: from debian.lan (unknown [IPv6:2a00:66c0:a::72c]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: tjoppen) by mail.acc.umu.se (Postfix) with ESMTPSA id 8C56E44B93 for ; Thu, 30 Jun 2022 14:42:43 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=acc.umu.se; s=mail1; t=1656592963; bh=gvrTpkOJYc4XojrPITm0T6+7lwmI8g3e4FuFbM0HYh0=; h=Subject:From:To:Date:From; b=u1ZUYPMCyMS+zr7H1bc6x13KlY9kK2xlxNGiNDcL0iwUcg4R76Tw2R2Gy0snytWt7 Etjblyx7NaRgPXIfdJaOpb2ez/XWB+VjRcspXIBSlOfdcXo30GmFn1EQsgPI/hU12O kdbRp+urTttZsM4DktErug49m5Oewp/lFUDoYbcnVwL10Fd7NcVUy+RVp233I/BUeN onCzLLANGKqaYlFRdHm2bp+RiXGs7B1zX0/B7vaDse93H9C7X+4T0odckx2i01Mpgx zPQfacQAQk8STDt/4priZc/RDiqdXS/+ey9BbOXDPSKwTLz+JdKJ9f7ja0Z900lySS RBy5ogh9Yq2oA== Message-ID: <7c2bdda6042d62e21fff91407393e77e7e7fedc2.camel@acc.umu.se> From: Tomas =?ISO-8859-1?Q?H=E4rdin?= To: FFmpeg development discussions and patches Date: Thu, 30 Jun 2022 14:42:42 +0200 Content-Type: multipart/mixed; boundary="=-2LK/QUqZri0Jgv0ZHbci" User-Agent: Evolution 3.38.3-1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] Make execute() and execute2() return FFMIN() of thread return codes 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: --=-2LK/QUqZri0Jgv0ZHbci Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit Hi Previous version of this patch failed fate-fic-avi with THREAD_TYPE=slice THREADS=2 due to thread_execute() always returning 0. Fixed in this version. The fic sample appears to indeed be broken. Some packets are truncated, including one zero-length packet. /Tomas --=-2LK/QUqZri0Jgv0ZHbci Content-Disposition: attachment; filename*0=0001-Make-execute-and-execute2-return-FFMIN-of-thread-ret.pat; filename*1=ch Content-Type: text/x-patch; name="0001-Make-execute-and-execute2-return-FFMIN-of-thread-ret.patch"; charset="UTF-8" Content-Transfer-Encoding: base64 RnJvbSA4NzIzNTRmZjcwZjZlODgwZDc3ZThiZGRkMjhiZmE3YmM2NTgyYWIyIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiA9P1VURi04P3E/VG9tYXM9MjBIPUMzPUE0cmRpbj89IDxnaXRA aGFlcmRpbi5zZT4KRGF0ZTogVGh1LCAxNiBKdW4gMjAyMiAxMjoxNjo0NCArMDIwMApTdWJqZWN0 OiBbUEFUQ0hdIE1ha2UgZXhlY3V0ZSgpIGFuZCBleGVjdXRlMigpIHJldHVybiBGRk1JTigpIG9m IHRocmVhZCByZXR1cm4KIGNvZGVzCgpBdCB0aGUgbW9tZW50IG9ubHkgZmljLmMgYWN0dWFsbHkg Y2hlY2tzIHJldHVybiBjb2RlIG9mIGV4ZWN1dGUoKSBoZW5jZSB0aGUgY2hhbmdlIHRvIGl0cyBG QVRFIHJlZmVyZW5jZQotLS0KIGxpYmF2Y29kZWMvYXZjb2RlYy5jICAgICAgICAgIHwgMTAgKysr KysrLS0tLQogbGliYXZjb2RlYy9wdGhyZWFkX3NsaWNlLmMgICAgfCAxMiArKysrKystLS0tLS0K IGxpYmF2ZmlsdGVyL3B0aHJlYWQuYyAgICAgICAgIHwgIDMgKystCiBsaWJhdnV0aWwvc2xpY2V0 aHJlYWQuYyAgICAgICB8IDM3ICsrKysrKysrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tCiBs aWJhdnV0aWwvc2xpY2V0aHJlYWQuaCAgICAgICB8ICA2ICsrKy0tLQogbGlic3dzY2FsZS9zd3Nj YWxlLmMgICAgICAgICAgfCAgNSArKystLQogbGlic3dzY2FsZS9zd3NjYWxlX2ludGVybmFsLmgg fCAgNCArKy0tCiB0ZXN0cy9yZWYvZmF0ZS9maWMtYXZpICAgICAgICB8IDMwICsrKysrKysrKysr Ky0tLS0tLS0tLS0tLS0tLS0KIDggZmlsZXMgY2hhbmdlZCwgNTggaW5zZXJ0aW9ucygrKSwgNDkg ZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvbGliYXZjb2RlYy9hdmNvZGVjLmMgYi9saWJhdmNv ZGVjL2F2Y29kZWMuYwppbmRleCA1ZjZlNzFhMzllLi40OWYwZmQwNmZiIDEwMDY0NAotLS0gYS9s aWJhdmNvZGVjL2F2Y29kZWMuYworKysgYi9saWJhdmNvZGVjL2F2Y29kZWMuYwpAQCAtNDQsMjgg KzQ0LDMwIEBACiAKIGludCBhdmNvZGVjX2RlZmF1bHRfZXhlY3V0ZShBVkNvZGVjQ29udGV4dCAq YywgaW50ICgqZnVuYykoQVZDb2RlY0NvbnRleHQgKmMyLCB2b2lkICphcmcyKSwgdm9pZCAqYXJn LCBpbnQgKnJldCwgaW50IGNvdW50LCBpbnQgc2l6ZSkKIHsKLSAgICBpbnQgaTsKKyAgICBpbnQg aSwgcnIgPSAwOwogCiAgICAgZm9yIChpID0gMDsgaSA8IGNvdW50OyBpKyspIHsKICAgICAgICAg aW50IHIgPSBmdW5jKGMsIChjaGFyICopYXJnICsgaSAqIHNpemUpOworICAgICAgICByciA9IEZG TUlOKHJyLCByKTsKICAgICAgICAgaWYgKHJldCkKICAgICAgICAgICAgIHJldFtpXSA9IHI7CiAg ICAgfQogICAgIGVtbXNfYygpOwotICAgIHJldHVybiAwOworICAgIHJldHVybiBycjsKIH0KIAog aW50IGF2Y29kZWNfZGVmYXVsdF9leGVjdXRlMihBVkNvZGVjQ29udGV4dCAqYywgaW50ICgqZnVu YykoQVZDb2RlY0NvbnRleHQgKmMyLCB2b2lkICphcmcyLCBpbnQgam9ibnIsIGludCB0aHJlYWRu ciksIHZvaWQgKmFyZywgaW50ICpyZXQsIGludCBjb3VudCkKIHsKLSAgICBpbnQgaTsKKyAgICBp bnQgaSwgcnIgPSAwOwogCiAgICAgZm9yIChpID0gMDsgaSA8IGNvdW50OyBpKyspIHsKICAgICAg ICAgaW50IHIgPSBmdW5jKGMsIGFyZywgaSwgMCk7CisgICAgICAgIHJyID0gRkZNSU4ocnIsIHIp OwogICAgICAgICBpZiAocmV0KQogICAgICAgICAgICAgcmV0W2ldID0gcjsKICAgICB9CiAgICAg ZW1tc19jKCk7Ci0gICAgcmV0dXJuIDA7CisgICAgcmV0dXJuIHJyOwogfQogCiBzdGF0aWMgQVZN dXRleCBjb2RlY19tdXRleCA9IEFWX01VVEVYX0lOSVRJQUxJWkVSOwpkaWZmIC0tZ2l0IGEvbGli YXZjb2RlYy9wdGhyZWFkX3NsaWNlLmMgYi9saWJhdmNvZGVjL3B0aHJlYWRfc2xpY2UuYwppbmRl eCAwYWQxOTY1YTIyLi5lMjkwMzg0NmViIDEwMDY0NAotLS0gYS9saWJhdmNvZGVjL3B0aHJlYWRf c2xpY2UuYworKysgYi9saWJhdmNvZGVjL3B0aHJlYWRfc2xpY2UuYwpAQCAtNTcsMTMgKzU3LDEz IEBAIHR5cGVkZWYgc3RydWN0IFNsaWNlVGhyZWFkQ29udGV4dCB7CiAgICAgcHRocmVhZF9tdXRl eF90ICpwcm9ncmVzc19tdXRleDsKIH0gU2xpY2VUaHJlYWRDb250ZXh0OwogCi1zdGF0aWMgdm9p ZCBtYWluX2Z1bmN0aW9uKHZvaWQgKnByaXYpIHsKK3N0YXRpYyBpbnQgbWFpbl9mdW5jdGlvbih2 b2lkICpwcml2KSB7CiAgICAgQVZDb2RlY0NvbnRleHQgKmF2Y3R4ID0gcHJpdjsKICAgICBTbGlj ZVRocmVhZENvbnRleHQgKmMgPSBhdmN0eC0+aW50ZXJuYWwtPnRocmVhZF9jdHg7Ci0gICAgYy0+ bWFpbmZ1bmMoYXZjdHgpOworICAgIHJldHVybiBjLT5tYWluZnVuYyhhdmN0eCk7CiB9CiAKLXN0 YXRpYyB2b2lkIHdvcmtlcl9mdW5jKHZvaWQgKnByaXYsIGludCBqb2JuciwgaW50IHRocmVhZG5y LCBpbnQgbmJfam9icywgaW50IG5iX3RocmVhZHMpCitzdGF0aWMgaW50IHdvcmtlcl9mdW5jKHZv aWQgKnByaXYsIGludCBqb2JuciwgaW50IHRocmVhZG5yLCBpbnQgbmJfam9icywgaW50IG5iX3Ro cmVhZHMpCiB7CiAgICAgQVZDb2RlY0NvbnRleHQgKmF2Y3R4ID0gcHJpdjsKICAgICBTbGljZVRo cmVhZENvbnRleHQgKmMgPSBhdmN0eC0+aW50ZXJuYWwtPnRocmVhZF9jdHg7CkBAIC03Myw2ICs3 Myw3IEBAIHN0YXRpYyB2b2lkIHdvcmtlcl9mdW5jKHZvaWQgKnByaXYsIGludCBqb2JuciwgaW50 IHRocmVhZG5yLCBpbnQgbmJfam9icywgaW50IG5iCiAgICAgICAgICAgICAgICAgICA6IGMtPmZ1 bmMyKGF2Y3R4LCBjLT5hcmdzLCBqb2JuciwgdGhyZWFkbnIpOwogICAgIGlmIChjLT5yZXRzKQog ICAgICAgICBjLT5yZXRzW2pvYm5yXSA9IHJldDsKKyAgICByZXR1cm4gcmV0OwogfQogCiB2b2lk IGZmX3NsaWNlX3RocmVhZF9mcmVlKEFWQ29kZWNDb250ZXh0ICphdmN0eCkKQEAgLTEwOCw4ICsx MDksNyBAQCBzdGF0aWMgaW50IHRocmVhZF9leGVjdXRlKEFWQ29kZWNDb250ZXh0ICphdmN0eCwg YWN0aW9uX2Z1bmMqIGZ1bmMsIHZvaWQgKmFyZywgaQogICAgIGMtPmZ1bmMgPSBmdW5jOwogICAg IGMtPnJldHMgPSByZXQ7CiAKLSAgICBhdnByaXZfc2xpY2V0aHJlYWRfZXhlY3V0ZShjLT50aHJl YWQsIGpvYl9jb3VudCwgISFjLT5tYWluZnVuYyAgKTsKLSAgICByZXR1cm4gMDsKKyAgICByZXR1 cm4gYXZwcml2X3NsaWNldGhyZWFkX2V4ZWN1dGUoYy0+dGhyZWFkLCBqb2JfY291bnQsICEhYy0+ bWFpbmZ1bmMgICk7CiB9CiAKIHN0YXRpYyBpbnQgdGhyZWFkX2V4ZWN1dGUyKEFWQ29kZWNDb250 ZXh0ICphdmN0eCwgYWN0aW9uX2Z1bmMyKiBmdW5jMiwgdm9pZCAqYXJnLCBpbnQgKnJldCwgaW50 IGpvYl9jb3VudCkKQEAgLTEzMSw3ICsxMzEsNyBAQCBpbnQgZmZfc2xpY2VfdGhyZWFkX2luaXQo QVZDb2RlY0NvbnRleHQgKmF2Y3R4KQogewogICAgIFNsaWNlVGhyZWFkQ29udGV4dCAqYzsKICAg ICBpbnQgdGhyZWFkX2NvdW50ID0gYXZjdHgtPnRocmVhZF9jb3VudDsKLSAgICB2b2lkICgqbWFp bmZ1bmMpKHZvaWQgKik7CisgICAgaW50ICgqbWFpbmZ1bmMpKHZvaWQgKik7CiAKICAgICAvLyBX ZSBjYW5ub3QgZG8gdGhpcyBpbiB0aGUgZW5jb2RlciBpbml0IGFzIHRoZSB0aHJlYWRzIGFyZSBj cmVhdGVkIGJlZm9yZQogICAgIGlmIChhdl9jb2RlY19pc19lbmNvZGVyKGF2Y3R4LT5jb2RlYykg JiYKZGlmZiAtLWdpdCBhL2xpYmF2ZmlsdGVyL3B0aHJlYWQuYyBiL2xpYmF2ZmlsdGVyL3B0aHJl YWQuYwppbmRleCAxYTA2M2QzY2MwLi44Y2VjMjc4YmUwIDEwMDY0NAotLS0gYS9saWJhdmZpbHRl ci9wdGhyZWFkLmMKKysrIGIvbGliYXZmaWx0ZXIvcHRocmVhZC5jCkBAIC00MywxMiArNDMsMTMg QEAgdHlwZWRlZiBzdHJ1Y3QgVGhyZWFkQ29udGV4dCB7CiAgICAgaW50ICAgKnJldHM7CiB9IFRo cmVhZENvbnRleHQ7CiAKLXN0YXRpYyB2b2lkIHdvcmtlcl9mdW5jKHZvaWQgKnByaXYsIGludCBq b2JuciwgaW50IHRocmVhZG5yLCBpbnQgbmJfam9icywgaW50IG5iX3RocmVhZHMpCitzdGF0aWMg aW50IHdvcmtlcl9mdW5jKHZvaWQgKnByaXYsIGludCBqb2JuciwgaW50IHRocmVhZG5yLCBpbnQg bmJfam9icywgaW50IG5iX3RocmVhZHMpCiB7CiAgICAgVGhyZWFkQ29udGV4dCAqYyA9IHByaXY7 CiAgICAgaW50IHJldCA9IGMtPmZ1bmMoYy0+Y3R4LCBjLT5hcmcsIGpvYm5yLCBuYl9qb2JzKTsK ICAgICBpZiAoYy0+cmV0cykKICAgICAgICAgYy0+cmV0c1tqb2Jucl0gPSByZXQ7CisgICAgcmV0 dXJuIHJldDsKIH0KIAogc3RhdGljIHZvaWQgc2xpY2VfdGhyZWFkX3VuaW5pdChUaHJlYWRDb250 ZXh0ICpjKQpkaWZmIC0tZ2l0IGEvbGliYXZ1dGlsL3NsaWNldGhyZWFkLmMgYi9saWJhdnV0aWwv c2xpY2V0aHJlYWQuYwppbmRleCBlYTFjOWM4MzExLi4yZTc4ZDMyYWI4IDEwMDY0NAotLS0gYS9s aWJhdnV0aWwvc2xpY2V0aHJlYWQuYworKysgYi9saWJhdnV0aWwvc2xpY2V0aHJlYWQuYwpAQCAt MzIsNiArMzIsNyBAQCB0eXBlZGVmIHN0cnVjdCBXb3JrZXJDb250ZXh0IHsKICAgICBwdGhyZWFk X2NvbmRfdCAgY29uZDsKICAgICBwdGhyZWFkX3QgICAgICAgdGhyZWFkOwogICAgIGludCAgICAg ICAgICAgICBkb25lOworICAgIGludCAgICAgICAgICAgICByZXQ7CiB9IFdvcmtlckNvbnRleHQ7 CiAKIHN0cnVjdCBBVlNsaWNlVGhyZWFkIHsKQEAgLTQ4LDExICs0OSwxMSBAQCBzdHJ1Y3QgQVZT bGljZVRocmVhZCB7CiAgICAgaW50ICAgICAgICAgICAgIGZpbmlzaGVkOwogCiAgICAgdm9pZCAg ICAgICAgICAgICpwcml2OwotICAgIHZvaWQgICAgICAgICAgICAoKndvcmtlcl9mdW5jKSh2b2lk ICpwcml2LCBpbnQgam9ibnIsIGludCB0aHJlYWRuciwgaW50IG5iX2pvYnMsIGludCBuYl90aHJl YWRzKTsKLSAgICB2b2lkICAgICAgICAgICAgKCptYWluX2Z1bmMpKHZvaWQgKnByaXYpOworICAg IGludCAgICAgICAgICAgICAoKndvcmtlcl9mdW5jKSh2b2lkICpwcml2LCBpbnQgam9ibnIsIGlu dCB0aHJlYWRuciwgaW50IG5iX2pvYnMsIGludCBuYl90aHJlYWRzKTsKKyAgICBpbnQgICAgICAg ICAgICAgKCptYWluX2Z1bmMpKHZvaWQgKnByaXYpOwogfTsKIAotc3RhdGljIGludCBydW5fam9i cyhBVlNsaWNlVGhyZWFkICpjdHgpCitzdGF0aWMgaW50IHJ1bl9qb2JzKEFWU2xpY2VUaHJlYWQg KmN0eCwgaW50ICpyZXRfb3V0KQogewogICAgIHVuc2lnbmVkIG5iX2pvYnMgICAgPSBjdHgtPm5i X2pvYnM7CiAgICAgdW5zaWduZWQgbmJfYWN0aXZlX3RocmVhZHMgPSBjdHgtPm5iX2FjdGl2ZV90 aHJlYWRzOwpAQCAtNjAsNyArNjEsOCBAQCBzdGF0aWMgaW50IHJ1bl9qb2JzKEFWU2xpY2VUaHJl YWQgKmN0eCkKICAgICB1bnNpZ25lZCBjdXJyZW50X2pvYiAgPSBmaXJzdF9qb2I7CiAKICAgICBk byB7Ci0gICAgICAgIGN0eC0+d29ya2VyX2Z1bmMoY3R4LT5wcml2LCBjdXJyZW50X2pvYiwgZmly c3Rfam9iLCBuYl9qb2JzLCBuYl9hY3RpdmVfdGhyZWFkcyk7CisgICAgICAgIGludCByZXQgPSBj dHgtPndvcmtlcl9mdW5jKGN0eC0+cHJpdiwgY3VycmVudF9qb2IsIGZpcnN0X2pvYiwgbmJfam9i cywgbmJfYWN0aXZlX3RocmVhZHMpOworICAgICAgICAqcmV0X291dCA9IEZGTUlOKCpyZXRfb3V0 LCByZXQpOwogICAgIH0gd2hpbGUgKChjdXJyZW50X2pvYiA9IGF0b21pY19mZXRjaF9hZGRfZXhw bGljaXQoJmN0eC0+Y3VycmVudF9qb2IsIDEsIG1lbW9yeV9vcmRlcl9hY3FfcmVsKSkgPCBuYl9q b2JzKTsKIAogICAgIHJldHVybiBjdXJyZW50X2pvYiA9PSBuYl9qb2JzICsgbmJfYWN0aXZlX3Ro cmVhZHMgLSAxOwpAQCAtODQsNyArODYsNyBAQCBzdGF0aWMgdm9pZCAqYXR0cmlidXRlX2FsaWdu X2FyZyB0aHJlYWRfd29ya2VyKHZvaWQgKnYpCiAgICAgICAgICAgICByZXR1cm4gTlVMTDsKICAg ICAgICAgfQogCi0gICAgICAgIGlmIChydW5fam9icyhjdHgpKSB7CisgICAgICAgIGlmIChydW5f am9icyhjdHgsICZ3LT5yZXQpKSB7CiAgICAgICAgICAgICBwdGhyZWFkX211dGV4X2xvY2soJmN0 eC0+ZG9uZV9tdXRleCk7CiAgICAgICAgICAgICBjdHgtPmRvbmUgPSAxOwogICAgICAgICAgICAg cHRocmVhZF9jb25kX3NpZ25hbCgmY3R4LT5kb25lX2NvbmQpOwpAQCAtOTQsOCArOTYsOCBAQCBz dGF0aWMgdm9pZCAqYXR0cmlidXRlX2FsaWduX2FyZyB0aHJlYWRfd29ya2VyKHZvaWQgKnYpCiB9 CiAKIGludCBhdnByaXZfc2xpY2V0aHJlYWRfY3JlYXRlKEFWU2xpY2VUaHJlYWQgKipwY3R4LCB2 b2lkICpwcml2LAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgdm9pZCAoKndvcmtlcl9m dW5jKSh2b2lkICpwcml2LCBpbnQgam9ibnIsIGludCB0aHJlYWRuciwgaW50IG5iX2pvYnMsIGlu dCBuYl90aHJlYWRzKSwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHZvaWQgKCptYWlu X2Z1bmMpKHZvaWQgKnByaXYpLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgaW50ICgq d29ya2VyX2Z1bmMpKHZvaWQgKnByaXYsIGludCBqb2JuciwgaW50IHRocmVhZG5yLCBpbnQgbmJf am9icywgaW50IG5iX3RocmVhZHMpLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgaW50 ICgqbWFpbl9mdW5jKSh2b2lkICpwcml2KSwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IGludCBuYl90aHJlYWRzKQogewogICAgIEFWU2xpY2VUaHJlYWQgKmN0eDsKQEAgLTE2Myw5ICsx NjUsOSBAQCBpbnQgYXZwcml2X3NsaWNldGhyZWFkX2NyZWF0ZShBVlNsaWNlVGhyZWFkICoqcGN0 eCwgdm9pZCAqcHJpdiwKICAgICByZXR1cm4gbmJfdGhyZWFkczsKIH0KIAotdm9pZCBhdnByaXZf c2xpY2V0aHJlYWRfZXhlY3V0ZShBVlNsaWNlVGhyZWFkICpjdHgsIGludCBuYl9qb2JzLCBpbnQg ZXhlY3V0ZV9tYWluKQoraW50IGF2cHJpdl9zbGljZXRocmVhZF9leGVjdXRlKEFWU2xpY2VUaHJl YWQgKmN0eCwgaW50IG5iX2pvYnMsIGludCBleGVjdXRlX21haW4pCiB7Ci0gICAgaW50IG5iX3dv cmtlcnMsIGksIGlzX2xhc3QgPSAwOworICAgIGludCBuYl93b3JrZXJzLCBpLCBpc19sYXN0ID0g MCwgcmV0ID0gMDsKIAogICAgIGF2X2Fzc2VydDAobmJfam9icyA+IDApOwogICAgIGN0eC0+bmJf am9icyAgICAgICAgICAgPSBuYl9qb2JzOwpAQCAtMTgwLDE0ICsxODIsMTUgQEAgdm9pZCBhdnBy aXZfc2xpY2V0aHJlYWRfZXhlY3V0ZShBVlNsaWNlVGhyZWFkICpjdHgsIGludCBuYl9qb2JzLCBp bnQgZXhlY3V0ZV9tYWkKICAgICAgICAgV29ya2VyQ29udGV4dCAqdyA9ICZjdHgtPndvcmtlcnNb aV07CiAgICAgICAgIHB0aHJlYWRfbXV0ZXhfbG9jaygmdy0+bXV0ZXgpOwogICAgICAgICB3LT5k b25lID0gMDsKKyAgICAgICAgdy0+cmV0ID0gMDsKICAgICAgICAgcHRocmVhZF9jb25kX3NpZ25h bCgmdy0+Y29uZCk7CiAgICAgICAgIHB0aHJlYWRfbXV0ZXhfdW5sb2NrKCZ3LT5tdXRleCk7CiAg ICAgfQogCiAgICAgaWYgKGN0eC0+bWFpbl9mdW5jICYmIGV4ZWN1dGVfbWFpbikKLSAgICAgICAg Y3R4LT5tYWluX2Z1bmMoY3R4LT5wcml2KTsKKyAgICAgICAgcmV0ID0gY3R4LT5tYWluX2Z1bmMo Y3R4LT5wcml2KTsKICAgICBlbHNlCi0gICAgICAgIGlzX2xhc3QgPSBydW5fam9icyhjdHgpOwor ICAgICAgICBpc19sYXN0ID0gcnVuX2pvYnMoY3R4LCAmcmV0KTsKIAogICAgIGlmICghaXNfbGFz dCkgewogICAgICAgICBwdGhyZWFkX211dGV4X2xvY2soJmN0eC0+ZG9uZV9tdXRleCk7CkBAIC0x OTYsNiArMTk5LDExIEBAIHZvaWQgYXZwcml2X3NsaWNldGhyZWFkX2V4ZWN1dGUoQVZTbGljZVRo cmVhZCAqY3R4LCBpbnQgbmJfam9icywgaW50IGV4ZWN1dGVfbWFpCiAgICAgICAgIGN0eC0+ZG9u ZSA9IDA7CiAgICAgICAgIHB0aHJlYWRfbXV0ZXhfdW5sb2NrKCZjdHgtPmRvbmVfbXV0ZXgpOwog ICAgIH0KKworICAgIGZvciAoaSA9IDA7IGkgPCBuYl93b3JrZXJzOyBpKyspCisgICAgICAgIHJl dCA9IEZGTUlOKHJldCwgY3R4LT53b3JrZXJzW2ldLnJldCk7CisKKyAgICByZXR1cm4gcmV0Owog fQogCiB2b2lkIGF2cHJpdl9zbGljZXRocmVhZF9mcmVlKEFWU2xpY2VUaHJlYWQgKipwY3R4KQpA QCAtMjM2LDE3ICsyNDQsMTggQEAgdm9pZCBhdnByaXZfc2xpY2V0aHJlYWRfZnJlZShBVlNsaWNl VGhyZWFkICoqcGN0eCkKICNlbHNlIC8qIEhBVkVfUFRIUkVBRFMgfHwgSEFWRV9XMzJUSFJFQURT IHx8IEhBVkVfT1MzMlRIUkVBRFMgKi8KIAogaW50IGF2cHJpdl9zbGljZXRocmVhZF9jcmVhdGUo QVZTbGljZVRocmVhZCAqKnBjdHgsIHZvaWQgKnByaXYsCi0gICAgICAgICAgICAgICAgICAgICAg ICAgICAgICB2b2lkICgqd29ya2VyX2Z1bmMpKHZvaWQgKnByaXYsIGludCBqb2JuciwgaW50IHRo cmVhZG5yLCBpbnQgbmJfam9icywgaW50IG5iX3RocmVhZHMpLAotICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgdm9pZCAoKm1haW5fZnVuYykodm9pZCAqcHJpdiksCisgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICBpbnQgKCp3b3JrZXJfZnVuYykodm9pZCAqcHJpdiwgaW50IGpvYm5y LCBpbnQgdGhyZWFkbnIsIGludCBuYl9qb2JzLCBpbnQgbmJfdGhyZWFkcyksCisgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICBpbnQgKCptYWluX2Z1bmMpKHZvaWQgKnByaXYpLAogICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgaW50IG5iX3RocmVhZHMpCiB7CiAgICAgKnBjdHggPSBO VUxMOwogICAgIHJldHVybiBBVkVSUk9SKEVOT1NZUyk7CiB9CiAKLXZvaWQgYXZwcml2X3NsaWNl dGhyZWFkX2V4ZWN1dGUoQVZTbGljZVRocmVhZCAqY3R4LCBpbnQgbmJfam9icywgaW50IGV4ZWN1 dGVfbWFpbikKK2ludCBhdnByaXZfc2xpY2V0aHJlYWRfZXhlY3V0ZShBVlNsaWNlVGhyZWFkICpj dHgsIGludCBuYl9qb2JzLCBpbnQgZXhlY3V0ZV9tYWluKQogewogICAgIGF2X2Fzc2VydDAoMCk7 CisgICAgcmV0dXJuIEFWRVJST1IoRU5PU1lTKTsKIH0KIAogdm9pZCBhdnByaXZfc2xpY2V0aHJl YWRfZnJlZShBVlNsaWNlVGhyZWFkICoqcGN0eCkKZGlmZiAtLWdpdCBhL2xpYmF2dXRpbC9zbGlj ZXRocmVhZC5oIGIvbGliYXZ1dGlsL3NsaWNldGhyZWFkLmgKaW5kZXggZjZmNmYzMDJjNC4uNWM4 ZjE5NzkzMiAxMDA2NDQKLS0tIGEvbGliYXZ1dGlsL3NsaWNldGhyZWFkLmgKKysrIGIvbGliYXZ1 dGlsL3NsaWNldGhyZWFkLmgKQEAgLTMxLDggKzMxLDggQEAgdHlwZWRlZiBzdHJ1Y3QgQVZTbGlj ZVRocmVhZCBBVlNsaWNlVGhyZWFkOwogICogQHJldHVybiByZXR1cm4gbnVtYmVyIG9mIHRocmVh ZHMgb3IgbmVnYXRpdmUgQVZFUlJPUiBvbiBmYWlsdXJlCiAgKi8KIGludCBhdnByaXZfc2xpY2V0 aHJlYWRfY3JlYXRlKEFWU2xpY2VUaHJlYWQgKipwY3R4LCB2b2lkICpwcml2LAotICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgdm9pZCAoKndvcmtlcl9mdW5jKSh2b2lkICpwcml2LCBpbnQg am9ibnIsIGludCB0aHJlYWRuciwgaW50IG5iX2pvYnMsIGludCBuYl90aHJlYWRzKSwKLSAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIHZvaWQgKCptYWluX2Z1bmMpKHZvaWQgKnByaXYpLAor ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgaW50ICgqd29ya2VyX2Z1bmMpKHZvaWQgKnBy aXYsIGludCBqb2JuciwgaW50IHRocmVhZG5yLCBpbnQgbmJfam9icywgaW50IG5iX3RocmVhZHMp LAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgaW50ICgqbWFpbl9mdW5jKSh2b2lkICpw cml2KSwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGludCBuYl90aHJlYWRzKTsKIAog LyoqCkBAIC00MSw3ICs0MSw3IEBAIGludCBhdnByaXZfc2xpY2V0aHJlYWRfY3JlYXRlKEFWU2xp Y2VUaHJlYWQgKipwY3R4LCB2b2lkICpwcml2LAogICogQHBhcmFtIG5iX2pvYnMgbnVtYmVyIG9m IGpvYnMsIG11c3QgYmUgPiAwCiAgKiBAcGFyYW0gZXhlY3V0ZV9tYWluIGFsc28gZXhlY3V0ZSBt YWluX2Z1bmMKICAqLwotdm9pZCBhdnByaXZfc2xpY2V0aHJlYWRfZXhlY3V0ZShBVlNsaWNlVGhy ZWFkICpjdHgsIGludCBuYl9qb2JzLCBpbnQgZXhlY3V0ZV9tYWluKTsKK2ludCBhdnByaXZfc2xp Y2V0aHJlYWRfZXhlY3V0ZShBVlNsaWNlVGhyZWFkICpjdHgsIGludCBuYl9qb2JzLCBpbnQgZXhl Y3V0ZV9tYWluKTsKIAogLyoqCiAgKiBEZXN0cm95IHNsaWNlIHRocmVhZGluZyBjb250ZXh0Lgpk aWZmIC0tZ2l0IGEvbGlic3dzY2FsZS9zd3NjYWxlLmMgYi9saWJzd3NjYWxlL3N3c2NhbGUuYwpp bmRleCA3YjQwZjQ5ZGE0Li4yZjlhMGI1YTdjIDEwMDY0NAotLS0gYS9saWJzd3NjYWxlL3N3c2Nh bGUuYworKysgYi9saWJzd3NjYWxlL3N3c2NhbGUuYwpAQCAtMTIxMSw4ICsxMjExLDggQEAgaW50 IGF0dHJpYnV0ZV9hbGlnbl9hcmcgc3dzX3NjYWxlKHN0cnVjdCBTd3NDb250ZXh0ICpjLAogICAg ICAgICAgICAgICAgICAgICAgICAgICBkc3QsIGRzdFN0cmlkZSwgMCwgYy0+ZHN0SCk7CiB9CiAK LXZvaWQgZmZfc3dzX3NsaWNlX3dvcmtlcih2b2lkICpwcml2LCBpbnQgam9ibnIsIGludCB0aHJl YWRuciwKLSAgICAgICAgICAgICAgICAgICAgICAgICBpbnQgbmJfam9icywgaW50IG5iX3RocmVh ZHMpCitpbnQgZmZfc3dzX3NsaWNlX3dvcmtlcih2b2lkICpwcml2LCBpbnQgam9ibnIsIGludCB0 aHJlYWRuciwKKyAgICAgICAgICAgICAgICAgICAgICAgIGludCBuYl9qb2JzLCBpbnQgbmJfdGhy ZWFkcykKIHsKICAgICBTd3NDb250ZXh0ICpwYXJlbnQgPSBwcml2OwogICAgIFN3c0NvbnRleHQg ICAgICAqYyA9IHBhcmVudC0+c2xpY2VfY3R4W3RocmVhZG5yXTsKQEAgLTEyNDEsNCArMTI0MSw1 IEBAIHZvaWQgZmZfc3dzX3NsaWNlX3dvcmtlcih2b2lkICpwcml2LCBpbnQgam9ibnIsIGludCB0 aHJlYWRuciwKICAgICB9CiAKICAgICBwYXJlbnQtPnNsaWNlX2Vyclt0aHJlYWRucl0gPSBlcnI7 CisgICAgcmV0dXJuIGVycjsKIH0KZGlmZiAtLWdpdCBhL2xpYnN3c2NhbGUvc3dzY2FsZV9pbnRl cm5hbC5oIGIvbGlic3dzY2FsZS9zd3NjYWxlX2ludGVybmFsLmgKaW5kZXggZTExOGI1NDQ1Ny4u ZWFiM2UyNjMzMSAxMDA2NDQKLS0tIGEvbGlic3dzY2FsZS9zd3NjYWxlX2ludGVybmFsLmgKKysr IGIvbGlic3dzY2FsZS9zd3NjYWxlX2ludGVybmFsLmgKQEAgLTExMzUsOCArMTEzNSw4IEBAIHZv aWQgZmZfaW5pdF92c2NhbGVfcGZuKFN3c0NvbnRleHQgKmMsIHl1djJwbGFuYXIxX2ZuIHl1djJw bGFuZTEsIHl1djJwbGFuYXJYX2ZuCiAgICAgeXV2MmludGVybGVhdmVkWF9mbiB5dXYybnYxMmNY LCB5dXYycGFja2VkMV9mbiB5dXYycGFja2VkMSwgeXV2MnBhY2tlZDJfZm4geXV2MnBhY2tlZDIs CiAgICAgeXV2MnBhY2tlZFhfZm4geXV2MnBhY2tlZFgsIHl1djJhbnlYX2ZuIHl1djJhbnlYLCBp bnQgdXNlX21teCk7CiAKLXZvaWQgZmZfc3dzX3NsaWNlX3dvcmtlcih2b2lkICpwcml2LCBpbnQg am9ibnIsIGludCB0aHJlYWRuciwKLSAgICAgICAgICAgICAgICAgICAgICAgICBpbnQgbmJfam9i cywgaW50IG5iX3RocmVhZHMpOworaW50IGZmX3N3c19zbGljZV93b3JrZXIodm9pZCAqcHJpdiwg aW50IGpvYm5yLCBpbnQgdGhyZWFkbnIsCisgICAgICAgICAgICAgICAgICAgICAgICBpbnQgbmJf am9icywgaW50IG5iX3RocmVhZHMpOwogCiAvL251bWJlciBvZiBleHRyYSBsaW5lcyB0byBwcm9j ZXNzCiAjZGVmaW5lIE1BWF9MSU5FU19BSEVBRCA0CmRpZmYgLS1naXQgYS90ZXN0cy9yZWYvZmF0 ZS9maWMtYXZpIGIvdGVzdHMvcmVmL2ZhdGUvZmljLWF2aQppbmRleCBkZjU1Nzg5ZDU0Li40NTQ2 ZjIzMGIxIDEwMDY0NAotLS0gYS90ZXN0cy9yZWYvZmF0ZS9maWMtYXZpCisrKyBiL3Rlc3RzL3Jl Zi9mYXRlL2ZpYy1hdmkKQEAgLTc2LDE5ICs3NiwxOCBAQAogMCwgICAgICAgICA3MCwgICAgICAg ICA3MCwgICAgICAgIDEsICAxNTY2NzIwLCAweDQwZjdkMzlhCiAwLCAgICAgICAgIDcxLCAgICAg ICAgIDcxLCAgICAgICAgMSwgIDE1NjY3MjAsIDB4NDBmN2QzOWEKIDAsICAgICAgICAgNzIsICAg ICAgICAgNzIsICAgICAgICAxLCAgMTU2NjcyMCwgMHg0MGY3ZDM5YQotMCwgICAgICAgICA3Mywg ICAgICAgICA3MywgICAgICAgIDEsICAxNTY2NzIwLCAweGE3ZDZlMjVmCi0wLCAgICAgICAgIDc0 LCAgICAgICAgIDc0LCAgICAgICAgMSwgIDE1NjY3MjAsIDB4YTdkNmUyNWYKLTAsICAgICAgICAg NzUsICAgICAgICAgNzUsICAgICAgICAxLCAgMTU2NjcyMCwgMHhhN2Q2ZTI1ZgotMCwgICAgICAg ICA3NiwgICAgICAgICA3NiwgICAgICAgIDEsICAxNTY2NzIwLCAweGE3ZDZlMjVmCi0wLCAgICAg ICAgIDc3LCAgICAgICAgIDc3LCAgICAgICAgMSwgIDE1NjY3MjAsIDB4YTdkNmUyNWYKLTAsICAg ICAgICAgNzgsICAgICAgICAgNzgsICAgICAgICAxLCAgMTU2NjcyMCwgMHhhN2Q2ZTI1ZgotMCwg ICAgICAgICA3OSwgICAgICAgICA3OSwgICAgICAgIDEsICAxNTY2NzIwLCAweGE3ZDZlMjVmCi0w LCAgICAgICAgIDgwLCAgICAgICAgIDgwLCAgICAgICAgMSwgIDE1NjY3MjAsIDB4YTdkNmUyNWYK LTAsICAgICAgICAgODEsICAgICAgICAgODEsICAgICAgICAxLCAgMTU2NjcyMCwgMHhhN2Q2ZTI1 ZgotMCwgICAgICAgICA4MiwgICAgICAgICA4MiwgICAgICAgIDEsICAxNTY2NzIwLCAweGE3ZDZl MjVmCi0wLCAgICAgICAgIDgzLCAgICAgICAgIDgzLCAgICAgICAgMSwgIDE1NjY3MjAsIDB4YTdk NmUyNWYKLTAsICAgICAgICAgODQsICAgICAgICAgODQsICAgICAgICAxLCAgMTU2NjcyMCwgMHhh N2Q2ZTI1ZgotMCwgICAgICAgICA4NSwgICAgICAgICA4NSwgICAgICAgIDEsICAxNTY2NzIwLCAw eGE3ZDZlMjVmCiswLCAgICAgICAgIDc0LCAgICAgICAgIDc0LCAgICAgICAgMSwgIDE1NjY3MjAs IDB4NDBmN2QzOWEKKzAsICAgICAgICAgNzUsICAgICAgICAgNzUsICAgICAgICAxLCAgMTU2Njcy MCwgMHg0MGY3ZDM5YQorMCwgICAgICAgICA3NiwgICAgICAgICA3NiwgICAgICAgIDEsICAxNTY2 NzIwLCAweDQwZjdkMzlhCiswLCAgICAgICAgIDc3LCAgICAgICAgIDc3LCAgICAgICAgMSwgIDE1 NjY3MjAsIDB4NDBmN2QzOWEKKzAsICAgICAgICAgNzgsICAgICAgICAgNzgsICAgICAgICAxLCAg MTU2NjcyMCwgMHg0MGY3ZDM5YQorMCwgICAgICAgICA3OSwgICAgICAgICA3OSwgICAgICAgIDEs ICAxNTY2NzIwLCAweDQwZjdkMzlhCiswLCAgICAgICAgIDgwLCAgICAgICAgIDgwLCAgICAgICAg MSwgIDE1NjY3MjAsIDB4NDBmN2QzOWEKKzAsICAgICAgICAgODEsICAgICAgICAgODEsICAgICAg ICAxLCAgMTU2NjcyMCwgMHg0MGY3ZDM5YQorMCwgICAgICAgICA4MiwgICAgICAgICA4MiwgICAg ICAgIDEsICAxNTY2NzIwLCAweDQwZjdkMzlhCiswLCAgICAgICAgIDgzLCAgICAgICAgIDgzLCAg ICAgICAgMSwgIDE1NjY3MjAsIDB4NDBmN2QzOWEKKzAsICAgICAgICAgODQsICAgICAgICAgODQs ICAgICAgICAxLCAgMTU2NjcyMCwgMHg0MGY3ZDM5YQorMCwgICAgICAgICA4NSwgICAgICAgICA4 NSwgICAgICAgIDEsICAxNTY2NzIwLCAweDQwZjdkMzlhCiAwLCAgICAgICAgIDg2LCAgICAgICAg IDg2LCAgICAgICAgMSwgIDE1NjY3MjAsIDB4YTdkNmUyNWYKIDAsICAgICAgICAgODcsICAgICAg ICAgODcsICAgICAgICAxLCAgMTU2NjcyMCwgMHhhN2Q2ZTI1ZgogMCwgICAgICAgICA4OCwgICAg ICAgICA4OCwgICAgICAgIDEsICAxNTY2NzIwLCAweGE3ZDZlMjVmCkBAIC0xMDQsNyArMTAzLDYg QEAKIDAsICAgICAgICAgOTgsICAgICAgICAgOTgsICAgICAgICAxLCAgMTU2NjcyMCwgMHhhN2Q2 ZTI1ZgogMCwgICAgICAgICA5OSwgICAgICAgICA5OSwgICAgICAgIDEsICAxNTY2NzIwLCAweGE3 ZDZlMjVmCiAwLCAgICAgICAgMTAwLCAgICAgICAgMTAwLCAgICAgICAgMSwgIDE1NjY3MjAsIDB4 ZWFmOGQyMDcKLTAsICAgICAgICAxMDEsICAgICAgICAxMDEsICAgICAgICAxLCAgMTU2NjcyMCwg MHg2NzI0OTgzZQogMCwgICAgICAgIDEwMiwgICAgICAgIDEwMiwgICAgICAgIDEsICAxNTY2NzIw LCAweDBlOTVkMjA5CiAwLCAgICAgICAgMTAzLCAgICAgICAgMTAzLCAgICAgICAgMSwgIDE1NjY3 MjAsIDB4MGU5NWQyMDkKIDAsICAgICAgICAxMDQsICAgICAgICAxMDQsICAgICAgICAxLCAgMTU2 NjcyMCwgMHgwZTk1ZDIwOQpAQCAtMTIxLDYgKzExOSw0IEBACiAwLCAgICAgICAgMTE1LCAgICAg ICAgMTE1LCAgICAgICAgMSwgIDE1NjY3MjAsIDB4ZmU4M2I5NjQKIDAsICAgICAgICAxMTYsICAg ICAgICAxMTYsICAgICAgICAxLCAgMTU2NjcyMCwgMHhmZTgzYjk2NAogMCwgICAgICAgIDExNywg ICAgICAgIDExNywgICAgICAgIDEsICAxNTY2NzIwLCAweGZlODNiOTY0Ci0wLCAgICAgICAgMTE4 LCAgICAgICAgMTE4LCAgICAgICAgMSwgIDE1NjY3MjAsIDB4MjVkYzMwYTYKLTAsICAgICAgICAx MTksICAgICAgICAxMTksICAgICAgICAxLCAgMTU2NjcyMCwgMHgyNWRjMzBhNgotMCwgICAgICAg IDEyMCwgICAgICAgIDEyMCwgICAgICAgIDEsICAxNTY2NzIwLCAweDI1ZGMzMGE2CiswLCAgICAg ICAgMTE5LCAgICAgICAgMTE5LCAgICAgICAgMSwgIDE1NjY3MjAsIDB4ZmU4M2I5NjQKLS0gCjIu MzAuMgoK --=-2LK/QUqZri0Jgv0ZHbci 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". --=-2LK/QUqZri0Jgv0ZHbci--