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 1A51247D3C for ; Sun, 19 Nov 2023 23:21:17 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id F061468CA21; Mon, 20 Nov 2023 01:21:13 +0200 (EET) Received: from mail-vs1-f44.google.com (mail-vs1-f44.google.com [209.85.217.44]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9B4A668C67E for ; Mon, 20 Nov 2023 01:21:06 +0200 (EET) Received: by mail-vs1-f44.google.com with SMTP id ada2fe7eead31-45d9b477f7bso1087467137.1 for ; Sun, 19 Nov 2023 15:21:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1700436065; x=1701040865; darn=ffmpeg.org; h=to:subject:message-id:date:from:in-reply-to:references:mime-version :from:to:cc:subject:date:message-id:reply-to; bh=QKsB/1qVUCmvJBmsSt5ambKJMPUkBt3kso4C4zjJrkM=; b=O3F1z1TukUAt0Yl+2tBT3GA6G1fP8b3dikz8fOjH4AZC3i5UTKO8wEwBuZygP9WocR sDOyxbiw+4q8pa8lmYANq1xROmhqLcngYetoW9WKWXsOb3aA6OKXKo2BOSgBbESrrAur R3uTD0cqepv3/VPxi2X9gphbwbZvYAYsnlKtyQpxcOhcnVkpLxRS6msVPP2V0+elKxZa 5KznDW9iPzkWnUi/PSnl0VwYVYp5K3+SGLid13PeHZBol/eJKTnyXlW6D4CAy1YDTCRA IsTz6YNBjB7GppAbE3bFnwhmt8jWSXHj4BLEgKi+wlRCCVOtAHanMYBRC0waChDdh8sq vFhw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700436065; x=1701040865; h=to:subject:message-id:date:from:in-reply-to:references:mime-version :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=QKsB/1qVUCmvJBmsSt5ambKJMPUkBt3kso4C4zjJrkM=; b=aik4YB8GLUUu+u6r3n8fPdplMV3cY7Ai1vm9U10UQ1ScXnF1F1fIDVZn5BBKNiqbDI S0kyeNhqQXC2+USqZJTUpe8xEYtV+3V+nud69peDs59CdgAuBTmgerJNEuwpfRMhtPQ+ R73XJSQ232QBmWcb8ueQRV9yKJcKYJnzMNtfCfnu77L/5klIqGStENzJNbpLFLKWvImA siwOS1RGqWbtjTzF/1ERLULxSThFy+GaAkpmUiUwsYTByLcsy1hK9k9XAEkRZaDg1tvE gFUeoGrWSvxSEu3fpkSbneE5W+bDIUJ9f66xuMO6rrYxeUEzlRcTfy0irbliQPfv+CG6 ggKw== X-Gm-Message-State: AOJu0YxnmLO8IeARm5gDVWbE/NH1QJsxkhSjuBTBKm3ZEOIbSd4HCsBu q040/sa2PXxskP5vX8c1S8ccyFA/NKuj6tPv5D/wiCbm X-Google-Smtp-Source: AGHT+IElcVJWDPKCfaGkw/1jPIvcSUFD9oxMzRUoSYX7MtatlW0gQ0CoMhI8qGhi1McS5ZsMD+tFkt42/vhKy+Kf6qE= X-Received: by 2002:a05:6102:33cd:b0:45f:b92c:663b with SMTP id w13-20020a05610233cd00b0045fb92c663bmr4160696vsh.29.1700436064889; Sun, 19 Nov 2023 15:21:04 -0800 (PST) MIME-Version: 1.0 References: In-Reply-To: From: Paul B Mahol Date: Mon, 20 Nov 2023 00:20:52 +0100 Message-ID: To: FFmpeg development discussions and patches Content-Type: multipart/mixed; boundary="0000000000009c895d060a899fdd" X-Content-Filtered-By: Mailman/MimeDel 2.1.29 Subject: Re: [FFmpeg-devel] [PATCH] avfilter: use AV_OPT_TYPE_CHLAYOUT 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: --0000000000009c895d060a899fdd Content-Type: text/plain; charset="UTF-8" Fixed issue. --0000000000009c895d060a899fdd Content-Type: text/x-patch; charset="US-ASCII"; name="0001-avfilter-use-AV_OPT_TYPE_CHLAYOUT.patch" Content-Disposition: attachment; filename="0001-avfilter-use-AV_OPT_TYPE_CHLAYOUT.patch" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_lp63pm8s0 RnJvbSAzYWJkZDRkMGIwODVhNmM1YWEzZTYxMTQ0NDhhMjk2N2Q1ODRkN2M0IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBQYXVsIEIgTWFob2wgPG9uZW1kYUBnbWFpbC5jb20+CkRhdGU6 IFN1biwgMTkgTm92IDIwMjMgMTk6MzU6NDMgKzAxMDAKU3ViamVjdDogW1BBVENIXSBhdmZpbHRl cjogdXNlIEFWX09QVF9UWVBFX0NITEFZT1VUCgpTaWduZWQtb2ZmLWJ5OiBQYXVsIEIgTWFob2wg PG9uZW1kYUBnbWFpbC5jb20+Ci0tLQogbGliYXZmaWx0ZXIvYWZfY2hhbm5lbG1hcC5jICAgfCA1 OSArKysrKysrKysrLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogbGliYXZmaWx0ZXIvYWZfY2hh bm5lbHNwbGl0LmMgfCAxNCArKystLS0tLS0KIGxpYmF2ZmlsdGVyL2FmX2pvaW4uYyAgICAgICAg IHwgMjMgKy0tLS0tLS0tLS0tLS0KIGxpYmF2ZmlsdGVyL2FmX3N1cnJvdW5kLmMgICAgIHwgMjgg KysrKystLS0tLS0tLS0tLS0KIGxpYmF2ZmlsdGVyL2FzcmNfYWZkZWxheXNyYy5jIHwgMjYgKyst LS0tLS0tLS0tLS0tCiBsaWJhdmZpbHRlci9hc3JjX2FudWxsc3JjLmMgICB8IDM0ICsrKy0tLS0t LS0tLS0tLS0tLS0tCiA2IGZpbGVzIGNoYW5nZWQsIDM1IGluc2VydGlvbnMoKyksIDE0OSBkZWxl dGlvbnMoLSkKCmRpZmYgLS1naXQgYS9saWJhdmZpbHRlci9hZl9jaGFubmVsbWFwLmMgYi9saWJh dmZpbHRlci9hZl9jaGFubmVsbWFwLmMKaW5kZXggMDliYzRjZmJlMS4uNGI3MWRjMTA2NSAxMDA2 NDQKLS0tIGEvbGliYXZmaWx0ZXIvYWZfY2hhbm5lbG1hcC5jCisrKyBiL2xpYmF2ZmlsdGVyL2Fm X2NoYW5uZWxtYXAuYwpAQCAtNTgsNyArNTgsNiBAQCBlbnVtIE1hcHBpbmdNb2RlIHsKIHR5cGVk ZWYgc3RydWN0IENoYW5uZWxNYXBDb250ZXh0IHsKICAgICBjb25zdCBBVkNsYXNzICpjbGFzczsK ICAgICBjaGFyICptYXBwaW5nX3N0cjsKLSAgICBjaGFyICpjaGFubmVsX2xheW91dF9zdHI7CiAg ICAgQVZDaGFubmVsTGF5b3V0IG91dHB1dF9sYXlvdXQ7CiAgICAgc3RydWN0IENoYW5uZWxNYXAg bWFwW01BWF9DSF07CiAgICAgaW50IG5jaDsKQEAgLTcyLDcgKzcxLDcgQEAgc3RhdGljIGNvbnN0 IEFWT3B0aW9uIGNoYW5uZWxtYXBfb3B0aW9uc1tdID0gewogICAgIHsgIm1hcCIsICJBIGNvbW1h LXNlcGFyYXRlZCBsaXN0IG9mIGlucHV0IGNoYW5uZWwgbnVtYmVycyBpbiBvdXRwdXQgb3JkZXIu IiwKICAgICAgICAgICBPRkZTRVQobWFwcGluZ19zdHIpLCAgICAgICAgQVZfT1BUX1RZUEVfU1RS SU5HLCAuZmxhZ3MgPSBBfEYgfSwKICAgICB7ICJjaGFubmVsX2xheW91dCIsICJPdXRwdXQgY2hh bm5lbCBsYXlvdXQuIiwKLSAgICAgICAgICBPRkZTRVQoY2hhbm5lbF9sYXlvdXRfc3RyKSwgQVZf T1BUX1RZUEVfU1RSSU5HLCAuZmxhZ3MgPSBBfEYgfSwKKyAgICAgICAgICBPRkZTRVQob3V0cHV0 X2xheW91dCksICAgICAgQVZfT1BUX1RZUEVfQ0hMQVlPVVQsIC5mbGFncyA9IEF8RiB9LAogICAg IHsgTlVMTCB9CiB9OwogCkBAIC0xMjIsNyArMTIxLDYgQEAgc3RhdGljIGF2X2NvbGQgaW50IGNo YW5uZWxtYXBfaW5pdChBVkZpbHRlckNvbnRleHQgKmN0eCkKICAgICBDaGFubmVsTWFwQ29udGV4 dCAqcyA9IGN0eC0+cHJpdjsKICAgICBjaGFyICptYXBwaW5nLCBzZXBhcmF0b3IgPSAnfCc7CiAg ICAgaW50IG1hcF9lbnRyaWVzID0gMDsKLSAgICBjaGFyIGJ1ZlsyNTZdOwogICAgIGVudW0gTWFw cGluZ01vZGUgbW9kZTsKICAgICB1aW50NjRfdCBvdXRfY2hfbWFzayA9IDA7CiAgICAgaW50IGk7 CkBAIC0yMzIsNTAgKzIzMCwyNSBAQCBzdGF0aWMgYXZfY29sZCBpbnQgY2hhbm5lbG1hcF9pbml0 KEFWRmlsdGVyQ29udGV4dCAqY3R4KQogICAgIHMtPm5jaCAgICAgICAgICAgPSBtYXBfZW50cmll czsKICAgICBpZiAob3V0X2NoX21hc2spCiAgICAgICAgIGF2X2NoYW5uZWxfbGF5b3V0X2Zyb21f bWFzaygmcy0+b3V0cHV0X2xheW91dCwgb3V0X2NoX21hc2spOwotICAgIGVsc2UKKyAgICBlbHNl IGlmIChtYXBfZW50cmllcykKICAgICAgICAgYXZfY2hhbm5lbF9sYXlvdXRfZGVmYXVsdCgmcy0+ b3V0cHV0X2xheW91dCwgbWFwX2VudHJpZXMpOwogCi0gICAgaWYgKHMtPmNoYW5uZWxfbGF5b3V0 X3N0cikgewotICAgICAgICBBVkNoYW5uZWxMYXlvdXQgZm10ID0geyAwIH07Ci0gICAgICAgIGlu dCByZXQ7Ci0gICAgICAgIGlmICgocmV0ID0gYXZfY2hhbm5lbF9sYXlvdXRfZnJvbV9zdHJpbmco JmZtdCwgcy0+Y2hhbm5lbF9sYXlvdXRfc3RyKSkgPCAwKSB7Ci0jaWYgRkZfQVBJX09MRF9DSEFO TkVMX0xBWU9VVAotICAgICAgICAgICAgdWludDY0X3QgbWFzazsKLUZGX0RJU0FCTEVfREVQUkVD QVRJT05fV0FSTklOR1MKLSAgICAgICAgICAgIGlmICgobWFzayA9IGF2X2dldF9jaGFubmVsX2xh eW91dChzLT5jaGFubmVsX2xheW91dF9zdHIpKSA9PSAwKSB7Ci0jZW5kaWYKLSAgICAgICAgICAg ICAgICBhdl9sb2coY3R4LCBBVl9MT0dfRVJST1IsICJFcnJvciBwYXJzaW5nIGNoYW5uZWwgbGF5 b3V0OiAnJXMnLlxuIiwKLSAgICAgICAgICAgICAgICAgICAgICAgcy0+Y2hhbm5lbF9sYXlvdXRf c3RyKTsKLSAgICAgICAgICAgICAgICByZXR1cm4gQVZFUlJPUihFSU5WQUwpOwotI2lmIEZGX0FQ SV9PTERfQ0hBTk5FTF9MQVlPVVQKLSAgICAgICAgICAgIH0KLUZGX0VOQUJMRV9ERVBSRUNBVElP Tl9XQVJOSU5HUwotICAgICAgICAgICAgYXZfbG9nKGN0eCwgQVZfTE9HX1dBUk5JTkcsICJDaGFu bmVsIGxheW91dCAnJXMnIHVzZXMgYSBkZXByZWNhdGVkIHN5bnRheC5cbiIsCi0gICAgICAgICAg ICAgICAgICAgcy0+Y2hhbm5lbF9sYXlvdXRfc3RyKTsKLSAgICAgICAgICAgIGF2X2NoYW5uZWxf bGF5b3V0X2Zyb21fbWFzaygmZm10LCBtYXNrKTsKLSNlbmRpZgotICAgICAgICB9Ci0gICAgICAg IGlmIChtb2RlID09IE1BUF9OT05FKSB7Ci0gICAgICAgICAgICBpbnQgaTsKLSAgICAgICAgICAg IHMtPm5jaCA9IGZtdC5uYl9jaGFubmVsczsKLSAgICAgICAgICAgIGZvciAoaSA9IDA7IGkgPCBz LT5uY2g7IGkrKykgewotICAgICAgICAgICAgICAgIHMtPm1hcFtpXS5pbl9jaGFubmVsX2lkeCAg PSBpOwotICAgICAgICAgICAgICAgIHMtPm1hcFtpXS5vdXRfY2hhbm5lbF9pZHggPSBpOwotICAg ICAgICAgICAgfQotICAgICAgICB9IGVsc2UgaWYgKG91dF9jaF9tYXNrICYmIGF2X2NoYW5uZWxf bGF5b3V0X2NvbXBhcmUoJnMtPm91dHB1dF9sYXlvdXQsICZmbXQpKSB7Ci0gICAgICAgICAgICBh dl9jaGFubmVsX2xheW91dF9kZXNjcmliZSgmcy0+b3V0cHV0X2xheW91dCwgYnVmLCBzaXplb2Yo YnVmKSk7Ci0gICAgICAgICAgICBhdl9sb2coY3R4LCBBVl9MT0dfRVJST1IsCi0gICAgICAgICAg ICAgICAgICAgIk91dHB1dCBjaGFubmVsIGxheW91dCAnJXMnIGRvZXMgbm90IG1hdGNoIHRoZSBs aXN0IG9mIGNoYW5uZWwgbWFwcGVkOiAnJXMnLlxuIiwKLSAgICAgICAgICAgICAgICAgICBzLT5j aGFubmVsX2xheW91dF9zdHIsIGJ1Zik7Ci0gICAgICAgICAgICByZXR1cm4gQVZFUlJPUihFSU5W QUwpOwotICAgICAgICB9IGVsc2UgaWYgKHMtPm5jaCAhPSBmbXQubmJfY2hhbm5lbHMpIHsKLSAg ICAgICAgICAgIGF2X2xvZyhjdHgsIEFWX0xPR19FUlJPUiwKLSAgICAgICAgICAgICAgICAgICAi T3V0cHV0IGNoYW5uZWwgbGF5b3V0ICVzIGRvZXMgbm90IG1hdGNoIHRoZSBudW1iZXIgb2YgY2hh bm5lbHMgbWFwcGVkICVkLlxuIiwKLSAgICAgICAgICAgICAgICAgICBzLT5jaGFubmVsX2xheW91 dF9zdHIsIHMtPm5jaCk7Ci0gICAgICAgICAgICByZXR1cm4gQVZFUlJPUihFSU5WQUwpOworICAg IGlmIChtb2RlID09IE1BUF9OT05FKSB7CisgICAgICAgIGludCBpOworICAgICAgICBzLT5uY2gg PSBzLT5vdXRwdXRfbGF5b3V0Lm5iX2NoYW5uZWxzOworICAgICAgICBmb3IgKGkgPSAwOyBpIDwg cy0+bmNoOyBpKyspIHsKKyAgICAgICAgICAgIHMtPm1hcFtpXS5pbl9jaGFubmVsX2lkeCAgPSBp OworICAgICAgICAgICAgcy0+bWFwW2ldLm91dF9jaGFubmVsX2lkeCA9IGk7CiAgICAgICAgIH0K LSAgICAgICAgcy0+b3V0cHV0X2xheW91dCA9IGZtdDsKKyAgICB9IGVsc2UgaWYgKHMtPm5jaCAh PSBzLT5vdXRwdXRfbGF5b3V0Lm5iX2NoYW5uZWxzKSB7CisgICAgICAgIGNoYXIgYnVmWzI1Nl07 CisgICAgICAgIGF2X2NoYW5uZWxfbGF5b3V0X2Rlc2NyaWJlKCZzLT5vdXRwdXRfbGF5b3V0LCBi dWYsIHNpemVvZihidWYpKTsKKyAgICAgICAgYXZfbG9nKGN0eCwgQVZfTE9HX0VSUk9SLAorICAg ICAgICAgICAgICAgIk91dHB1dCBjaGFubmVsIGxheW91dCAlcyBkb2VzIG5vdCBtYXRjaCB0aGUg bnVtYmVyIG9mIGNoYW5uZWxzIG1hcHBlZCAlZC5cbiIsCisgICAgICAgICAgICAgICBidWYsIHMt Pm5jaCk7CisgICAgICAgIHJldHVybiBBVkVSUk9SKEVJTlZBTCk7CiAgICAgfQorCiAgICAgaWYg KCFzLT5vdXRwdXRfbGF5b3V0Lm5iX2NoYW5uZWxzKSB7CiAgICAgICAgIGF2X2xvZyhjdHgsIEFW X0xPR19FUlJPUiwgIk91dHB1dCBjaGFubmVsIGxheW91dCBpcyBub3Qgc2V0IGFuZCAiCiAgICAg ICAgICAgICAgICAiY2Fubm90IGJlIGd1ZXNzZWQgZnJvbSB0aGUgbWFwcy5cbiIpOwpkaWZmIC0t Z2l0IGEvbGliYXZmaWx0ZXIvYWZfY2hhbm5lbHNwbGl0LmMgYi9saWJhdmZpbHRlci9hZl9jaGFu bmVsc3BsaXQuYwppbmRleCBiZDRhZmZmMTIyLi45MzJiNTFkNzAxIDEwMDY0NAotLS0gYS9saWJh dmZpbHRlci9hZl9jaGFubmVsc3BsaXQuYworKysgYi9saWJhdmZpbHRlci9hZl9jaGFubmVsc3Bs aXQuYwpAQCAtNDAsNyArNDAsNiBAQCB0eXBlZGVmIHN0cnVjdCBDaGFubmVsU3BsaXRDb250ZXh0 IHsKICAgICBjb25zdCBBVkNsYXNzICpjbGFzczsKIAogICAgIEFWQ2hhbm5lbExheW91dCBjaGFu bmVsX2xheW91dDsKLSAgICBjaGFyICAgICpjaGFubmVsX2xheW91dF9zdHI7CiAgICAgY2hhciAg ICAqY2hhbm5lbHNfc3RyOwogCiAgICAgaW50ICAgICAgbWFwWzY0XTsKQEAgLTUwLDcgKzQ5LDcg QEAgdHlwZWRlZiBzdHJ1Y3QgQ2hhbm5lbFNwbGl0Q29udGV4dCB7CiAjZGVmaW5lIEEgQVZfT1BU X0ZMQUdfQVVESU9fUEFSQU0KICNkZWZpbmUgRiBBVl9PUFRfRkxBR19GSUxURVJJTkdfUEFSQU0K IHN0YXRpYyBjb25zdCBBVk9wdGlvbiBjaGFubmVsc3BsaXRfb3B0aW9uc1tdID0gewotICAgIHsg ImNoYW5uZWxfbGF5b3V0IiwgIklucHV0IGNoYW5uZWwgbGF5b3V0LiIsIE9GRlNFVChjaGFubmVs X2xheW91dF9zdHIpLCBBVl9PUFRfVFlQRV9TVFJJTkcsIHsgLnN0ciA9ICJzdGVyZW8iIH0sIC5m bGFncyA9IEF8RiB9LAorICAgIHsgImNoYW5uZWxfbGF5b3V0IiwgIklucHV0IGNoYW5uZWwgbGF5 b3V0LiIsIE9GRlNFVChjaGFubmVsX2xheW91dCksICAgQVZfT1BUX1RZUEVfQ0hMQVlPVVQsIHsg LnN0ciA9ICJzdGVyZW8iIH0sIC5mbGFncyA9IEF8RiB9LAogICAgIHsgImNoYW5uZWxzIiwgICAg ICAgICJDaGFubmVscyB0byBleHRyYWN0LiIsIE9GRlNFVChjaGFubmVsc19zdHIpLCAgICAgICBB Vl9PUFRfVFlQRV9TVFJJTkcsIHsgLnN0ciA9ICJhbGwiIH0sICAgIC5mbGFncyA9IEF8RiB9LAog ICAgIHsgTlVMTCB9CiB9OwpAQCAtNjMsMTMgKzYyLDYgQEAgc3RhdGljIGF2X2NvbGQgaW50IGlu aXQoQVZGaWx0ZXJDb250ZXh0ICpjdHgpCiAgICAgQVZDaGFubmVsTGF5b3V0IGNoYW5uZWxfbGF5 b3V0ID0geyAwIH07CiAgICAgaW50IGFsbCA9IDAsIHJldCA9IDAsIGk7CiAKLSAgICBpZiAoKHJl dCA9IGF2X2NoYW5uZWxfbGF5b3V0X2Zyb21fc3RyaW5nKCZzLT5jaGFubmVsX2xheW91dCwgcy0+ Y2hhbm5lbF9sYXlvdXRfc3RyKSkgPCAwKSB7Ci0gICAgICAgIGF2X2xvZyhjdHgsIEFWX0xPR19F UlJPUiwgIkVycm9yIHBhcnNpbmcgY2hhbm5lbCBsYXlvdXQgJyVzJy5cbiIsCi0gICAgICAgICAg ICAgICBzLT5jaGFubmVsX2xheW91dF9zdHIpOwotICAgICAgICByZXQgPSBBVkVSUk9SKEVJTlZB TCk7Ci0gICAgICAgIGdvdG8gZmFpbDsKLSAgICB9Ci0KICAgICBpZiAoIXN0cmNtcChzLT5jaGFu bmVsc19zdHIsICJhbGwiKSkgewogICAgICAgICBpZiAoKHJldCA9IGF2X2NoYW5uZWxfbGF5b3V0 X2NvcHkoJmNoYW5uZWxfbGF5b3V0LCAmcy0+Y2hhbm5lbF9sYXlvdXQpKSA8IDApCiAgICAgICAg ICAgICBnb3RvIGZhaWw7CkBAIC0xMDAsOSArOTIsMTEgQEAgc3RhdGljIGF2X2NvbGQgaW50IGlu aXQoQVZGaWx0ZXJDb250ZXh0ICpjdHgpCiAgICAgICAgIGlmIChhbGwpIHsKICAgICAgICAgICAg IHMtPm1hcFtpXSA9IGk7CiAgICAgICAgIH0gZWxzZSB7CisgICAgICAgICAgICBjaGFyIGJ1Zlsx MjhdOworICAgICAgICAgICAgYXZfY2hhbm5lbF9sYXlvdXRfZGVzY3JpYmUoJnMtPmNoYW5uZWxf bGF5b3V0LCBidWYsIHNpemVvZihidWYpKTsKICAgICAgICAgICAgIGlmICgocmV0ID0gYXZfY2hh bm5lbF9sYXlvdXRfaW5kZXhfZnJvbV9jaGFubmVsKCZzLT5jaGFubmVsX2xheW91dCwgY2hhbm5l bCkpIDwgMCkgewogICAgICAgICAgICAgICAgIGF2X2xvZyhjdHgsIEFWX0xPR19FUlJPUiwgIkNo YW5uZWwgbmFtZSAnJXMnIG5vdCBwcmVzZW50IGluIGNoYW5uZWwgbGF5b3V0ICclcycuXG4iLAot ICAgICAgICAgICAgICAgICAgICAgICBwYWQubmFtZSwgcy0+Y2hhbm5lbF9sYXlvdXRfc3RyKTsK KyAgICAgICAgICAgICAgICAgICAgICAgcGFkLm5hbWUsIGJ1Zik7CiAgICAgICAgICAgICAgICAg YXZfZnJlZXAoJnBhZC5uYW1lKTsKICAgICAgICAgICAgICAgICBnb3RvIGZhaWw7CiAgICAgICAg ICAgICB9CmRpZmYgLS1naXQgYS9saWJhdmZpbHRlci9hZl9qb2luLmMgYi9saWJhdmZpbHRlci9h Zl9qb2luLmMKaW5kZXggNWRiZjlkOGQyMi4uNDE2Y2ZkN2E5YSAxMDA2NDQKLS0tIGEvbGliYXZm aWx0ZXIvYWZfam9pbi5jCisrKyBiL2xpYmF2ZmlsdGVyL2FmX2pvaW4uYwpAQCAtNDgsNyArNDgs NiBAQCB0eXBlZGVmIHN0cnVjdCBKb2luQ29udGV4dCB7CiAKICAgICBpbnQgaW5wdXRzOwogICAg IGNoYXIgKm1hcDsKLSAgICBjaGFyICAgICpjaGFubmVsX2xheW91dF9zdHI7CiAgICAgQVZDaGFu bmVsTGF5b3V0IGNoX2xheW91dDsKIAogICAgIGludDY0X3QgIGVvZl9wdHM7CkBAIC03Myw3ICs3 Miw3IEBAIHR5cGVkZWYgc3RydWN0IEpvaW5Db250ZXh0IHsKIHN0YXRpYyBjb25zdCBBVk9wdGlv biBqb2luX29wdGlvbnNbXSA9IHsKICAgICB7ICJpbnB1dHMiLCAgICAgICAgICJOdW1iZXIgb2Yg aW5wdXQgc3RyZWFtcy4iLCBPRkZTRVQoaW5wdXRzKSwgICAgICAgICAgICAgQVZfT1BUX1RZUEVf SU5ULCAgICB7IC5pNjQgPSAyIH0sIDEsIElOVF9NQVgsICAgICAgIEF8RiB9LAogICAgIHsgImNo YW5uZWxfbGF5b3V0IiwgIkNoYW5uZWwgbGF5b3V0IG9mIHRoZSAiCi0gICAgICAgICAgICAgICAg ICAgICAgICAib3V0cHV0IHN0cmVhbS4iLCAgICAgICAgICAgT0ZGU0VUKGNoYW5uZWxfbGF5b3V0 X3N0ciksIEFWX09QVF9UWVBFX1NUUklORywgey5zdHIgPSAic3RlcmVvIn0sIDAsIDAsIEF8RiB9 LAorICAgICAgICAgICAgICAgICAgICAgICAgIm91dHB1dCBzdHJlYW0uIiwgICAgICAgICAgIE9G RlNFVChjaF9sYXlvdXQpLCAgICAgICAgICBBVl9PUFRfVFlQRV9DSExBWU9VVCwgey5zdHIgPSAi c3RlcmVvIn0sIDAsIDAsIEF8RiB9LAogICAgIHsgIm1hcCIsICAgICAgICAgICAgIkEgY29tbWEt c2VwYXJhdGVkIGxpc3Qgb2YgY2hhbm5lbHMgbWFwcyBpbiB0aGUgZm9ybWF0ICIKICAgICAgICAg ICAgICAgICAgICAgICAgICInaW5wdXRfc3RyZWFtLmlucHV0X2NoYW5uZWwtb3V0cHV0X2NoYW5u ZWwuIiwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICBPRkZTRVQobWFwKSwgICAgICAgICAgICAgICAgQVZfT1BUX1RZUEVfU1RSSU5HLCAgICAgICAg ICAgICAgICAgLmZsYWdzID0gQXxGIH0sCkBAIC0xNTcsMjYgKzE1Niw2IEBAIHN0YXRpYyBhdl9j b2xkIGludCBqb2luX2luaXQoQVZGaWx0ZXJDb250ZXh0ICpjdHgpCiAgICAgSm9pbkNvbnRleHQg KnMgPSBjdHgtPnByaXY7CiAgICAgaW50IHJldCwgaTsKIAotICAgIHJldCA9IGF2X2NoYW5uZWxf bGF5b3V0X2Zyb21fc3RyaW5nKCZzLT5jaF9sYXlvdXQsIHMtPmNoYW5uZWxfbGF5b3V0X3N0cik7 Ci0gICAgaWYgKHJldCA8IDApIHsKLSNpZiBGRl9BUElfT0xEX0NIQU5ORUxfTEFZT1VUCi0gICAg ICAgIHVpbnQ2NF90IG1hc2s7Ci1GRl9ESVNBQkxFX0RFUFJFQ0FUSU9OX1dBUk5JTkdTCi0gICAg ICAgIG1hc2sgPSBhdl9nZXRfY2hhbm5lbF9sYXlvdXQocy0+Y2hhbm5lbF9sYXlvdXRfc3RyKTsK LSAgICAgICAgaWYgKCFtYXNrKSB7Ci0jZW5kaWYKLSAgICAgICAgICAgIGF2X2xvZyhjdHgsIEFW X0xPR19FUlJPUiwgIkVycm9yIHBhcnNpbmcgY2hhbm5lbCBsYXlvdXQgJyVzJy5cbiIsCi0gICAg ICAgICAgICAgICAgICAgcy0+Y2hhbm5lbF9sYXlvdXRfc3RyKTsKLSAgICAgICAgICAgIHJldHVy biBBVkVSUk9SKEVJTlZBTCk7Ci0jaWYgRkZfQVBJX09MRF9DSEFOTkVMX0xBWU9VVAotICAgICAg ICB9Ci1GRl9FTkFCTEVfREVQUkVDQVRJT05fV0FSTklOR1MKLSAgICAgICAgYXZfbG9nKGN0eCwg QVZfTE9HX1dBUk5JTkcsICJDaGFubmVsIGxheW91dCAnJXMnIHVzZXMgYSBkZXByZWNhdGVkIHN5 bnRheC5cbiIsCi0gICAgICAgICAgICAgICBzLT5jaGFubmVsX2xheW91dF9zdHIpOwotICAgICAg ICBhdl9jaGFubmVsX2xheW91dF9mcm9tX21hc2soJnMtPmNoX2xheW91dCwgbWFzayk7Ci0jZW5k aWYKLSAgICB9Ci0KICAgICBzLT5jaGFubmVscyAgICAgPSBhdl9jYWxsb2Mocy0+Y2hfbGF5b3V0 Lm5iX2NoYW5uZWxzLCBzaXplb2YoKnMtPmNoYW5uZWxzKSk7CiAgICAgcy0+YnVmZmVycyAgICAg ID0gYXZfY2FsbG9jKHMtPmNoX2xheW91dC5uYl9jaGFubmVscywgc2l6ZW9mKCpzLT5idWZmZXJz KSk7CiAgICAgcy0+aW5wdXRfZnJhbWVzID0gYXZfY2FsbG9jKHMtPmlucHV0cywgc2l6ZW9mKCpz LT5pbnB1dF9mcmFtZXMpKTsKZGlmZiAtLWdpdCBhL2xpYmF2ZmlsdGVyL2FmX3N1cnJvdW5kLmMg Yi9saWJhdmZpbHRlci9hZl9zdXJyb3VuZC5jCmluZGV4IDMzOThjMjU0NDYuLjc5ZGY4NjA4MWMg MTAwNjQ0Ci0tLSBhL2xpYmF2ZmlsdGVyL2FmX3N1cnJvdW5kLmMKKysrIGIvbGliYXZmaWx0ZXIv YWZfc3Vycm91bmQuYwpAQCAtNjEsOCArNjEsOCBAQCBzdGF0aWMgY29uc3QgaW50IHNjX21hcFsx Nl0gPSB7CiB0eXBlZGVmIHN0cnVjdCBBdWRpb1N1cnJvdW5kQ29udGV4dCB7CiAgICAgY29uc3Qg QVZDbGFzcyAqY2xhc3M7CiAKLSAgICBjaGFyICpvdXRfY2hhbm5lbF9sYXlvdXRfc3RyOwotICAg IGNoYXIgKmluX2NoYW5uZWxfbGF5b3V0X3N0cjsKKyAgICBBVkNoYW5uZWxMYXlvdXQgb3V0X2No X2xheW91dDsKKyAgICBBVkNoYW5uZWxMYXlvdXQgaW5fY2hfbGF5b3V0OwogCiAgICAgZmxvYXQg bGV2ZWxfaW47CiAgICAgZmxvYXQgbGV2ZWxfb3V0OwpAQCAtOTMsOCArOTMsNiBAQCB0eXBlZGVm IHN0cnVjdCBBdWRpb1N1cnJvdW5kQ29udGV4dCB7CiAgICAgZmxvYXQgbG93Y3V0OwogICAgIGZs b2F0IGhpZ2hjdXQ7CiAKLSAgICBBVkNoYW5uZWxMYXlvdXQgb3V0X2NoX2xheW91dDsKLSAgICBB VkNoYW5uZWxMYXlvdXQgaW5fY2hfbGF5b3V0OwogICAgIGludCBuYl9pbl9jaGFubmVsczsKICAg ICBpbnQgbmJfb3V0X2NoYW5uZWxzOwogCkBAIC0xMTA3LDIwICsxMTA1LDggQEAgc3RhdGljIGF2 X2NvbGQgaW50IGluaXQoQVZGaWx0ZXJDb250ZXh0ICpjdHgpCiB7CiAgICAgQXVkaW9TdXJyb3Vu ZENvbnRleHQgKnMgPSBjdHgtPnByaXY7CiAgICAgaW50NjRfdCBpbl9jaGFubmVsX2xheW91dCwg b3V0X2NoYW5uZWxfbGF5b3V0OworICAgIGNoYXIgaW5fbmFtZVsxMjhdLCBvdXRfbmFtZVsxMjhd OwogICAgIGZsb2F0IG92ZXJsYXA7Ci0gICAgaW50IHJldDsKLQotICAgIGlmICgocmV0ID0gYXZf Y2hhbm5lbF9sYXlvdXRfZnJvbV9zdHJpbmcoJnMtPm91dF9jaF9sYXlvdXQsIHMtPm91dF9jaGFu bmVsX2xheW91dF9zdHIpKSA8IDApIHsKLSAgICAgICAgYXZfbG9nKGN0eCwgQVZfTE9HX0VSUk9S LCAiRXJyb3IgcGFyc2luZyBvdXRwdXQgY2hhbm5lbCBsYXlvdXQgJyVzJy5cbiIsCi0gICAgICAg ICAgICAgICBzLT5vdXRfY2hhbm5lbF9sYXlvdXRfc3RyKTsKLSAgICAgICAgcmV0dXJuIHJldDsK LSAgICB9Ci0KLSAgICBpZiAoKHJldCA9IGF2X2NoYW5uZWxfbGF5b3V0X2Zyb21fc3RyaW5nKCZz LT5pbl9jaF9sYXlvdXQsIHMtPmluX2NoYW5uZWxfbGF5b3V0X3N0cikpIDwgMCkgewotICAgICAg ICBhdl9sb2coY3R4LCBBVl9MT0dfRVJST1IsICJFcnJvciBwYXJzaW5nIGlucHV0IGNoYW5uZWwg bGF5b3V0ICclcycuXG4iLAotICAgICAgICAgICAgICAgcy0+aW5fY2hhbm5lbF9sYXlvdXRfc3Ry KTsKLSAgICAgICAgcmV0dXJuIEFWRVJST1IoRUlOVkFMKTsKLSAgICB9CiAKICAgICBpZiAocy0+ bG93Y3V0ZiA+PSBzLT5oaWdoY3V0ZikgewogICAgICAgICBhdl9sb2coY3R4LCBBVl9MT0dfRVJS T1IsICJMb3cgY3V0LW9mZiAnJWQnIHNob3VsZCBiZSBsZXNzIHRoYW4gaGlnaCBjdXQtb2ZmICcl ZCcuXG4iLApAQCAtMTE4MSw4ICsxMTY3LDEwIEBAIHN0YXRpYyBhdl9jb2xkIGludCBpbml0KEFW RmlsdGVyQ29udGV4dCAqY3R4KQogICAgICAgICBicmVhazsKICAgICBkZWZhdWx0OgogZmFpbDoK KyAgICAgICAgYXZfY2hhbm5lbF9sYXlvdXRfZGVzY3JpYmUoJnMtPm91dF9jaF9sYXlvdXQsIG91 dF9uYW1lLCBzaXplb2Yob3V0X25hbWUpKTsKKyAgICAgICAgYXZfY2hhbm5lbF9sYXlvdXRfZGVz Y3JpYmUoJnMtPmluX2NoX2xheW91dCwgaW5fbmFtZSwgc2l6ZW9mKGluX25hbWUpKTsKICAgICAg ICAgYXZfbG9nKGN0eCwgQVZfTE9HX0VSUk9SLCAiVW5zdXBwb3J0ZWQgdXBtaXg6ICclcycgLT4g JyVzJy5cbiIsCi0gICAgICAgICAgICAgICBzLT5pbl9jaGFubmVsX2xheW91dF9zdHIsIHMtPm91 dF9jaGFubmVsX2xheW91dF9zdHIpOworICAgICAgICAgICAgICAgaW5fbmFtZSwgb3V0X25hbWUp OwogICAgICAgICByZXR1cm4gQVZFUlJPUihFSU5WQUwpOwogICAgIH0KIApAQCAtMTQxNyw4ICsx NDA1LDggQEAgc3RhdGljIGludCBwcm9jZXNzX2NvbW1hbmQoQVZGaWx0ZXJDb250ZXh0ICpjdHgs IGNvbnN0IGNoYXIgKmNtZCwgY29uc3QgY2hhciAqYXIKICNkZWZpbmUgVEZMQUdTIEFWX09QVF9G TEFHX0FVRElPX1BBUkFNfEFWX09QVF9GTEFHX0ZJTFRFUklOR19QQVJBTXxBVl9PUFRfRkxBR19S VU5USU1FX1BBUkFNCiAKIHN0YXRpYyBjb25zdCBBVk9wdGlvbiBzdXJyb3VuZF9vcHRpb25zW10g PSB7Ci0gICAgeyAiY2hsX291dCIsICAgInNldCBvdXRwdXQgY2hhbm5lbCBsYXlvdXQiLCBPRkZT RVQob3V0X2NoYW5uZWxfbGF5b3V0X3N0ciksIEFWX09QVF9UWVBFX1NUUklORywgey5zdHI9IjUu MSJ9LCAwLCAgIDAsIEZMQUdTIH0sCi0gICAgeyAiY2hsX2luIiwgICAgInNldCBpbnB1dCBjaGFu bmVsIGxheW91dCIsICBPRkZTRVQoaW5fY2hhbm5lbF9sYXlvdXRfc3RyKSwgIEFWX09QVF9UWVBF X1NUUklORywgey5zdHI9InN0ZXJlbyJ9LDAsIDAsIEZMQUdTIH0sCisgICAgeyAiY2hsX291dCIs ICAgInNldCBvdXRwdXQgY2hhbm5lbCBsYXlvdXQiLCBPRkZTRVQob3V0X2NoX2xheW91dCksICAg ICAgICAgIEFWX09QVF9UWVBFX0NITEFZT1VULCB7LnN0cj0iNS4xIn0sIDAsICAgMCwgRkxBR1Mg fSwKKyAgICB7ICJjaGxfaW4iLCAgICAic2V0IGlucHV0IGNoYW5uZWwgbGF5b3V0IiwgIE9GRlNF VChpbl9jaF9sYXlvdXQpLCAgICAgICAgICAgQVZfT1BUX1RZUEVfQ0hMQVlPVVQsIHsuc3RyPSJz dGVyZW8ifSwwLCAwLCBGTEFHUyB9LAogICAgIHsgImxldmVsX2luIiwgICJzZXQgaW5wdXQgbGV2 ZWwiLCAgICAgICAgICAgT0ZGU0VUKGxldmVsX2luKSwgICAgICAgICAgICAgICBBVl9PUFRfVFlQ RV9GTE9BVCwgIHsuZGJsPTF9LCAgICAgMCwgIDEwLCBURkxBR1MgfSwKICAgICB7ICJsZXZlbF9v dXQiLCAic2V0IG91dHB1dCBsZXZlbCIsICAgICAgICAgIE9GRlNFVChsZXZlbF9vdXQpLCAgICAg ICAgICAgICAgQVZfT1BUX1RZUEVfRkxPQVQsICB7LmRibD0xfSwgICAgIDAsICAxMCwgVEZMQUdT IH0sCiAgICAgeyAibGZlIiwgICAgICAgIm91dHB1dCBMRkUiLCAgICAgICAgICAgICAgICBPRkZT RVQob3V0cHV0X2xmZSksICAgICAgICAgICAgIEFWX09QVF9UWVBFX0JPT0wsICAgey5pNjQ9MX0s ICAgICAwLCAgIDEsIFRGTEFHUyB9LApkaWZmIC0tZ2l0IGEvbGliYXZmaWx0ZXIvYXNyY19hZmRl bGF5c3JjLmMgYi9saWJhdmZpbHRlci9hc3JjX2FmZGVsYXlzcmMuYwppbmRleCBhN2QyNWM1MzA5 Li5mM2YwYjA4MGEwIDEwMDY0NAotLS0gYS9saWJhdmZpbHRlci9hc3JjX2FmZGVsYXlzcmMuYwor KysgYi9saWJhdmZpbHRlci9hc3JjX2FmZGVsYXlzcmMuYwpAQCAtMzYsMjMgKzM2LDEwIEBAIHR5 cGVkZWYgc3RydWN0IEFGRGVsYXlTcmNDb250ZXh0IHsKICAgICBpbnQgbmJfc2FtcGxlczsKICAg ICBpbnQgbmJfdGFwczsKICAgICBBVkNoYW5uZWxMYXlvdXQgY2hsYXlvdXQ7Ci0gICAgY2hhciAq Y2hsYXlvdXRfc3RyOwogCiAgICAgaW50NjRfdCBwdHM7CiB9IEFGRGVsYXlTcmNDb250ZXh0Owog Ci1zdGF0aWMgYXZfY29sZCBpbnQgaW5pdChBVkZpbHRlckNvbnRleHQgKmN0eCkKLXsKLSAgICBB RkRlbGF5U3JjQ29udGV4dCAqcyA9IGN0eC0+cHJpdjsKLSAgICBpbnQgcmV0OwotCi0gICAgcmV0 ID0gZmZfcGFyc2VfY2hhbm5lbF9sYXlvdXQoJnMtPmNobGF5b3V0LCBOVUxMLCBzLT5jaGxheW91 dF9zdHIsIGN0eCk7Ci0gICAgaWYgKHJldCA8IDApCi0gICAgICAgIHJldHVybiByZXQ7Ci0KLSAg ICByZXR1cm4gMDsKLX0KLQogc3RhdGljIGZsb2F0IHNpbmNmKGZsb2F0IHgpCiB7CiAgICAgaWYg KHggPT0gMC5mKQpAQCAtMTM0LDEzICsxMjEsNiBAQCBzdGF0aWMgY29uc3QgQVZGaWx0ZXJQYWQg YWZkZWxheXNyY19vdXRwdXRzW10gPSB7CiAgICAgfSwKIH07CiAKLXN0YXRpYyBhdl9jb2xkIHZv aWQgdW5pbml0KEFWRmlsdGVyQ29udGV4dCAqY3R4KQotewotICAgIEFGRGVsYXlTcmNDb250ZXh0 ICpzID0gY3R4LT5wcml2OwotCi0gICAgYXZfY2hhbm5lbF9sYXlvdXRfdW5pbml0KCZzLT5jaGxh eW91dCk7Ci19Ci0KICNkZWZpbmUgQUYgQVZfT1BUX0ZMQUdfQVVESU9fUEFSQU18QVZfT1BUX0ZM QUdfRklMVEVSSU5HX1BBUkFNCiAjZGVmaW5lIE9GRlNFVCh4KSBvZmZzZXRvZihBRkRlbGF5U3Jj Q29udGV4dCwgeCkKIApAQCAtMTUzLDggKzEzMyw4IEBAIHN0YXRpYyBjb25zdCBBVk9wdGlvbiBh ZmRlbGF5c3JjX29wdGlvbnNbXSA9IHsKICAgICB7ICJuIiwgICAgICAgICAgICJzZXQgdGhlIG51 bWJlciBvZiBzYW1wbGVzIHBlciByZXF1ZXN0ZWQgZnJhbWUiLCBPRkZTRVQobmJfc2FtcGxlcyks ICBBVl9PUFRfVFlQRV9JTlQsICAgey5pNjQ9MTAyNH0sICAgMSwgSU5UX01BWCwgICBBRiB9LAog ICAgIHsgInRhcHMiLCAgICAgICAgInNldCBudW1iZXIgb2YgdGFwcyBmb3IgZGVsYXkgZmlsdGVy IiwgICAgICAgICAgIE9GRlNFVChuYl90YXBzKSwgICAgIEFWX09QVF9UWVBFX0lOVCwgICB7Lmk2 ND0wfSwgICAgICAwLCAgIDMyNzY4LCAgIEFGIH0sCiAgICAgeyAidCIsICAgICAgICAgICAic2V0 IG51bWJlciBvZiB0YXBzIGZvciBkZWxheSBmaWx0ZXIiLCAgICAgICAgICAgT0ZGU0VUKG5iX3Rh cHMpLCAgICAgQVZfT1BUX1RZUEVfSU5ULCAgIHsuaTY0PTB9LCAgICAgIDAsICAgMzI3NjgsICAg QUYgfSwKLSAgICB7ICJjaGFubmVsX2xheW91dCIsICJzZXQgY2hhbm5lbCBsYXlvdXQiLCAgICAg ICAgICAgICAgICAgICAgICAgICBPRkZTRVQoY2hsYXlvdXRfc3RyKSxBVl9PUFRfVFlQRV9TVFJJ Tkcsey5zdHI9InN0ZXJlbyJ9LDAsICAgICAgMCwgICBBRiB9LAotICAgIHsgImMiLCAgICAgICAg ICAgICAgInNldCBjaGFubmVsIGxheW91dCIsICAgICAgICAgICAgICAgICAgICAgICAgIE9GRlNF VChjaGxheW91dF9zdHIpLEFWX09QVF9UWVBFX1NUUklORyx7LnN0cj0ic3RlcmVvIn0sMCwgICAg ICAwLCAgIEFGIH0sCisgICAgeyAiY2hhbm5lbF9sYXlvdXQiLCAic2V0IGNoYW5uZWwgbGF5b3V0 IiwgICAgICAgICAgICAgICAgICAgICAgICAgT0ZGU0VUKGNobGF5b3V0KSwgICAgQVZfT1BUX1RZ UEVfQ0hMQVlPVVQsey5zdHI9InN0ZXJlbyJ9LDAsICAgICAgMCwgICBBRiB9LAorICAgIHsgImMi LCAgICAgICAgICAgICAgInNldCBjaGFubmVsIGxheW91dCIsICAgICAgICAgICAgICAgICAgICAg ICAgIE9GRlNFVChjaGxheW91dCksICAgIEFWX09QVF9UWVBFX0NITEFZT1VULHsuc3RyPSJzdGVy ZW8ifSwwLCAgICAgIDAsICAgQUYgfSwKICAgICB7IE5VTEwgfQogfTsKIApAQCAtMTY1LDkgKzE0 NSw3IEBAIGNvbnN0IEFWRmlsdGVyIGZmX2FzcmNfYWZkZWxheXNyYyA9IHsKICAgICAuZGVzY3Jp cHRpb24gICA9IE5VTExfSUZfQ09ORklHX1NNQUxMKCJHZW5lcmF0ZSBhIEZyYWN0aW9uYWwgZGVs YXkgRklSIGNvZWZmaWNpZW50cy4iKSwKICAgICAucHJpdl9zaXplICAgICA9IHNpemVvZihBRkRl bGF5U3JjQ29udGV4dCksCiAgICAgLnByaXZfY2xhc3MgICAgPSAmYWZkZWxheXNyY19jbGFzcywK LSAgICAuaW5pdCAgICAgICAgICA9IGluaXQsCiAgICAgLmFjdGl2YXRlICAgICAgPSBhY3RpdmF0 ZSwKLSAgICAudW5pbml0ICAgICAgICA9IHVuaW5pdCwKICAgICAuaW5wdXRzICAgICAgICA9IE5V TEwsCiAgICAgRklMVEVSX09VVFBVVFMoYWZkZWxheXNyY19vdXRwdXRzKSwKICAgICBGSUxURVJf UVVFUllfRlVOQyhxdWVyeV9mb3JtYXRzKSwKZGlmZiAtLWdpdCBhL2xpYmF2ZmlsdGVyL2FzcmNf YW51bGxzcmMuYyBiL2xpYmF2ZmlsdGVyL2FzcmNfYW51bGxzcmMuYwppbmRleCBjODkxMDBjMGRj Li5hODg4N2RhNjJkIDEwMDY0NAotLS0gYS9saWJhdmZpbHRlci9hc3JjX2FudWxsc3JjLmMKKysr IGIvbGliYXZmaWx0ZXIvYXNyY19hbnVsbHNyYy5jCkBAIC0zOCw5ICszOCw3IEBACiAKIHR5cGVk ZWYgc3RydWN0IEFOdWxsQ29udGV4dCB7CiAgICAgY29uc3QgQVZDbGFzcyAqY2xhc3M7Ci0gICAg Y2hhciAgICpjaGFubmVsX2xheW91dF9zdHI7CiAgICAgQVZDaGFubmVsTGF5b3V0IGNoX2xheW91 dDsKLSAgICBjaGFyICAgKnNhbXBsZV9yYXRlX3N0cjsKICAgICBpbnQgICAgIHNhbXBsZV9yYXRl OwogICAgIGludDY0X3QgZHVyYXRpb247CiAgICAgaW50IG5iX3NhbXBsZXM7ICAgICAgICAgICAg IC8vLzwgbnVtYmVyIG9mIHNhbXBsZXMgcGVyIHJlcXVlc3RlZCBmcmFtZQpAQCAtNTEsMTAgKzQ5 LDEwIEBAIHR5cGVkZWYgc3RydWN0IEFOdWxsQ29udGV4dCB7CiAjZGVmaW5lIEZMQUdTIEFWX09Q VF9GTEFHX0FVRElPX1BBUkFNfEFWX09QVF9GTEFHX0ZJTFRFUklOR19QQVJBTQogCiBzdGF0aWMg Y29uc3QgQVZPcHRpb24gYW51bGxzcmNfb3B0aW9uc1tdPSB7Ci0gICAgeyAiY2hhbm5lbF9sYXlv dXQiLCAic2V0IGNoYW5uZWxfbGF5b3V0IiwgT0ZGU0VUKGNoYW5uZWxfbGF5b3V0X3N0ciksIEFW X09QVF9UWVBFX1NUUklORywgey5zdHIgPSAic3RlcmVvIn0sIDAsIDAsIEZMQUdTIH0sCi0gICAg eyAiY2wiLCAgICAgICAgICAgICAic2V0IGNoYW5uZWxfbGF5b3V0IiwgT0ZGU0VUKGNoYW5uZWxf bGF5b3V0X3N0ciksIEFWX09QVF9UWVBFX1NUUklORywgey5zdHIgPSAic3RlcmVvIn0sIDAsIDAs IEZMQUdTIH0sCi0gICAgeyAic2FtcGxlX3JhdGUiLCAgICAic2V0IHNhbXBsZSByYXRlIiwgICAg T0ZGU0VUKHNhbXBsZV9yYXRlX3N0cikgICAsIEFWX09QVF9UWVBFX1NUUklORywgey5zdHIgPSAi NDQxMDAifSwgMCwgMCwgRkxBR1MgfSwKLSAgICB7ICJyIiwgICAgICAgICAgICAgICJzZXQgc2Ft cGxlIHJhdGUiLCAgICBPRkZTRVQoc2FtcGxlX3JhdGVfc3RyKSAgICwgQVZfT1BUX1RZUEVfU1RS SU5HLCB7LnN0ciA9ICI0NDEwMCJ9LCAwLCAwLCBGTEFHUyB9LAorICAgIHsgImNoYW5uZWxfbGF5 b3V0IiwgInNldCBjaGFubmVsX2xheW91dCIsIE9GRlNFVChjaF9sYXlvdXQpLCBBVl9PUFRfVFlQ RV9DSExBWU9VVCwgey5zdHIgPSAic3RlcmVvIn0sIDAsIDAsIEZMQUdTIH0sCisgICAgeyAiY2wi LCAgICAgICAgICAgICAic2V0IGNoYW5uZWxfbGF5b3V0IiwgT0ZGU0VUKGNoX2xheW91dCksIEFW X09QVF9UWVBFX0NITEFZT1VULCB7LnN0ciA9ICJzdGVyZW8ifSwgMCwgMCwgRkxBR1MgfSwKKyAg ICB7ICJzYW1wbGVfcmF0ZSIsICAgICJzZXQgc2FtcGxlIHJhdGUiLCAgICBPRkZTRVQoc2FtcGxl X3JhdGUpICAgLCBBVl9PUFRfVFlQRV9JTlQsIHsuaTY0ID0gNDQxMDB9LCAwLCAwLCBGTEFHUyB9 LAorICAgIHsgInIiLCAgICAgICAgICAgICAgInNldCBzYW1wbGUgcmF0ZSIsICAgIE9GRlNFVChz YW1wbGVfcmF0ZSkgICAsIEFWX09QVF9UWVBFX0lOVCwgey5pNjQgPSA0NDEwMH0sIDAsIDAsIEZM QUdTIH0sCiAgICAgeyAibmJfc2FtcGxlcyIsICAgICAic2V0IHRoZSBudW1iZXIgb2Ygc2FtcGxl cyBwZXIgcmVxdWVzdGVkIGZyYW1lIiwgT0ZGU0VUKG5iX3NhbXBsZXMpLCBBVl9PUFRfVFlQRV9J TlQsIHsuaTY0ID0gMTAyNH0sIDEsIFVJTlQxNl9NQVgsIEZMQUdTIH0sCiAgICAgeyAibiIsICAg ICAgICAgICAgICAic2V0IHRoZSBudW1iZXIgb2Ygc2FtcGxlcyBwZXIgcmVxdWVzdGVkIGZyYW1l IiwgT0ZGU0VUKG5iX3NhbXBsZXMpLCBBVl9PUFRfVFlQRV9JTlQsIHsuaTY0ID0gMTAyNH0sIDEs IFVJTlQxNl9NQVgsIEZMQUdTIH0sCiAgICAgeyAiZHVyYXRpb24iLCAgICAgICAic2V0IHRoZSBh dWRpbyBkdXJhdGlvbiIsICAgICAgICAgICAgICAgICAgICAgICAgT0ZGU0VUKGR1cmF0aW9uKSwg ICBBVl9PUFRfVFlQRV9EVVJBVElPTiwgey5pNjQgPSAtMX0sIC0xLCBJTlQ2NF9NQVgsIEZMQUdT IH0sCkBAIC02NCwyMiArNjIsNiBAQCBzdGF0aWMgY29uc3QgQVZPcHRpb24gYW51bGxzcmNfb3B0 aW9uc1tdPSB7CiAKIEFWRklMVEVSX0RFRklORV9DTEFTUyhhbnVsbHNyYyk7CiAKLXN0YXRpYyBh dl9jb2xkIGludCBpbml0KEFWRmlsdGVyQ29udGV4dCAqY3R4KQotewotICAgIEFOdWxsQ29udGV4 dCAqbnVsbCA9IGN0eC0+cHJpdjsKLSAgICBpbnQgcmV0OwotCi0gICAgaWYgKChyZXQgPSBmZl9w YXJzZV9zYW1wbGVfcmF0ZSgmbnVsbC0+c2FtcGxlX3JhdGUsCi0gICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgbnVsbC0+c2FtcGxlX3JhdGVfc3RyLCBjdHgpKSA8IDApCi0gICAg ICAgIHJldHVybiByZXQ7Ci0KLSAgICBpZiAoKHJldCA9IGZmX3BhcnNlX2NoYW5uZWxfbGF5b3V0 KCZudWxsLT5jaF9sYXlvdXQsIE5VTEwsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgbnVsbC0+Y2hhbm5lbF9sYXlvdXRfc3RyLCBjdHgpKSA8IDApCi0gICAgICAgIHJl dHVybiByZXQ7Ci0KLSAgICByZXR1cm4gMDsKLX0KLQogc3RhdGljIGludCBxdWVyeV9mb3JtYXRz KEFWRmlsdGVyQ29udGV4dCAqY3R4KQogewogICAgIEFOdWxsQ29udGV4dCAqbnVsbCA9IGN0eC0+ cHJpdjsKQEAgLTEyOSwxMiArMTExLDYgQEAgc3RhdGljIGludCBhY3RpdmF0ZShBVkZpbHRlckNv bnRleHQgKmN0eCkKICAgICByZXR1cm4gRkZFUlJPUl9OT1RfUkVBRFk7CiB9CiAKLXN0YXRpYyBh dl9jb2xkIHZvaWQgdW5pbml0KEFWRmlsdGVyQ29udGV4dCAqY3R4KQotewotICAgIEFOdWxsQ29u dGV4dCAqcyA9IGN0eC0+cHJpdjsKLSAgICBhdl9jaGFubmVsX2xheW91dF91bmluaXQoJnMtPmNo X2xheW91dCk7Ci19Ci0KIHN0YXRpYyBjb25zdCBBVkZpbHRlclBhZCBhdmZpbHRlcl9hc3JjX2Fu dWxsc3JjX291dHB1dHNbXSA9IHsKICAgICB7CiAgICAgICAgIC5uYW1lICAgICAgICAgID0gImRl ZmF1bHQiLApAQCAtMTQ2LDggKzEyMiw2IEBAIHN0YXRpYyBjb25zdCBBVkZpbHRlclBhZCBhdmZp bHRlcl9hc3JjX2FudWxsc3JjX291dHB1dHNbXSA9IHsKIGNvbnN0IEFWRmlsdGVyIGZmX2FzcmNf YW51bGxzcmMgPSB7CiAgICAgLm5hbWUgICAgICAgICAgPSAiYW51bGxzcmMiLAogICAgIC5kZXNj cmlwdGlvbiAgID0gTlVMTF9JRl9DT05GSUdfU01BTEwoIk51bGwgYXVkaW8gc291cmNlLCByZXR1 cm4gZW1wdHkgYXVkaW8gZnJhbWVzLiIpLAotICAgIC5pbml0ICAgICAgICAgID0gaW5pdCwKLSAg ICAudW5pbml0ICAgICAgICA9IHVuaW5pdCwKICAgICAucHJpdl9zaXplICAgICA9IHNpemVvZihB TnVsbENvbnRleHQpLAogICAgIC5pbnB1dHMgICAgICAgID0gTlVMTCwKICAgICBGSUxURVJfT1VU UFVUUyhhdmZpbHRlcl9hc3JjX2FudWxsc3JjX291dHB1dHMpLAotLSAKMi40Mi4xCgo= --0000000000009c895d060a899fdd 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". --0000000000009c895d060a899fdd--