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 9C847476F9 for ; Sun, 19 Nov 2023 19:33:31 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id DAA7168CA2D; Sun, 19 Nov 2023 21:33:27 +0200 (EET) Received: from mail-vs1-f41.google.com (mail-vs1-f41.google.com [209.85.217.41]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EBA5F68C2B3 for ; Sun, 19 Nov 2023 21:33:21 +0200 (EET) Received: by mail-vs1-f41.google.com with SMTP id ada2fe7eead31-45db0df090eso1282259137.3 for ; Sun, 19 Nov 2023 11:33:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1700422400; x=1701027200; darn=ffmpeg.org; h=to:subject:message-id:date:from:mime-version:from:to:cc:subject :date:message-id:reply-to; bh=1fnRbz0vrugbFiWEQZ/Osft3D+ph/qrBwzv+Bf4aQNk=; b=FBbBWhULMKbM84P+GEnHH1m305LZEvhLyPPZoqlY13qsFoTkr7ihOfiZDseQBzpKxL niaUfIDe2gLTfLC/moChrwTfEZYrg3wop/IZ5LOaXJUJ0O5By2eq6WChyUCCbT8IB/09 lFVrPfV9p4IDL7+e9lSFEJF7HH7ygLHDMmuGiUVH99Hezqwk6+iSoMh3kJ3jpctxMayb SRBP4D460rOLW5ds0vzF0DH6FKOPDI3b68j4sTKG6pIRlbDASjuyupG9C+3MwEzy/SUe tHAvpkcv0Evfp8OD9OnzETAMzKvWYL/zcFU/qPIya54RZAokC63FWp0uNOb3D27GW8JA IWsw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700422400; x=1701027200; h=to:subject:message-id:date:from:mime-version:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=1fnRbz0vrugbFiWEQZ/Osft3D+ph/qrBwzv+Bf4aQNk=; b=PAwsA7jzpCeNJJNoOJGX6JPRrmj1oeXrat1aogPUYVC1pWy6SvvO7ZwUtp5Yivnuss uciQCGwoYdHSxOnFdu+/rELSOjimQMRejTDmbq45BDlfHLixcz+FkXPd4yhKyoAPWX3t 4mvAO3tSM9bm+t0Ob6AQ4623AhOsoXBgEczRgtheXxh0OYiCUR6Tashe3Vj+V99LzQM8 Atkf7CfBRxQvUM7I3ZbRhzpj+p4Yw3zVsr/n7y3xRpopHy037gKxNTWxILkIYdBuzX69 emtlW4hrt7Jj4E8JT8klMCwj6kD7Owlk5gjrLpdVsYM0LZ3tq9pw93ZWbkTBuw1IlFRR jkMw== X-Gm-Message-State: AOJu0Yzl4V3x2YRqmzKymaHLfSxAZP1wcH2gCkWfubzt3hJnWeq+lvx+ Las3ip0a59fkYrcVPCU3X6zc+wNritqNr7iC3HqhZuRy X-Google-Smtp-Source: AGHT+IHatwsS9iXl+uF9RH2h0p1lnE8Ytpdi4IDYihfhck2SU5WldkF8Oyxc73pcLvEvqw5Skm9guEa7sTJEA2ylXlE= X-Received: by 2002:a67:cb08:0:b0:45d:9f13:1d1c with SMTP id b8-20020a67cb08000000b0045d9f131d1cmr4610042vsl.7.1700422400356; Sun, 19 Nov 2023 11:33:20 -0800 (PST) MIME-Version: 1.0 From: Paul B Mahol Date: Sun, 19 Nov 2023 20:33:08 +0100 Message-ID: To: FFmpeg development discussions and patches Content-Type: multipart/mixed; boundary="000000000000244cfb060a86716c" X-Content-Filtered-By: Mailman/MimeDel 2.1.29 Subject: [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: --000000000000244cfb060a86716c Content-Type: text/plain; charset="UTF-8" Attached. --000000000000244cfb060a86716c 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_lp5vkzyv0 RnJvbSA3OWQzZmNlZWNlMGVhZDE2M2ZmY2FjYTc1M2I5NDc5NjY5Nzc2ZDJmIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBQYXVsIEIgTWFob2wgPG9uZW1kYUBnbWFpbC5jb20+CkRhdGU6 IFN1biwgMTkgTm92IDIwMjMgMTk6MzU6NDMgKzAxMDAKU3ViamVjdDogW1BBVENIXSBhdmZpbHRl cjogdXNlIEFWX09QVF9UWVBFX0NITEFZT1VUCgpTaWduZWQtb2ZmLWJ5OiBQYXVsIEIgTWFob2wg PG9uZW1kYUBnbWFpbC5jb20+Ci0tLQogbGliYXZmaWx0ZXIvYWZfY2hhbm5lbG1hcC5jICAgfCA1 NyArKysrKysrKystLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogbGliYXZmaWx0ZXIvYWZfY2hh bm5lbHNwbGl0LmMgfCAxNCArKystLS0tLS0KIGxpYmF2ZmlsdGVyL2FmX2pvaW4uYyAgICAgICAg IHwgMjMgKy0tLS0tLS0tLS0tLS0KIGxpYmF2ZmlsdGVyL2FmX3N1cnJvdW5kLmMgICAgIHwgMjgg KysrKystLS0tLS0tLS0tLS0KIGxpYmF2ZmlsdGVyL2FzcmNfYWZkZWxheXNyYy5jIHwgMjYgKyst LS0tLS0tLS0tLS0tLQogbGliYXZmaWx0ZXIvYXNyY19hbnVsbHNyYy5jICAgfCAzNCArKystLS0t LS0tLS0tLS0tLS0tLS0KIDYgZmlsZXMgY2hhbmdlZCwgMzQgaW5zZXJ0aW9ucygrKSwgMTQ4IGRl bGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2xpYmF2ZmlsdGVyL2FmX2NoYW5uZWxtYXAuYyBiL2xp YmF2ZmlsdGVyL2FmX2NoYW5uZWxtYXAuYwppbmRleCAwOWJjNGNmYmUxLi4zYTE2ZjNlNGI1IDEw MDY0NAotLS0gYS9saWJhdmZpbHRlci9hZl9jaGFubmVsbWFwLmMKKysrIGIvbGliYXZmaWx0ZXIv YWZfY2hhbm5lbG1hcC5jCkBAIC01OCw3ICs1OCw2IEBAIGVudW0gTWFwcGluZ01vZGUgewogdHlw ZWRlZiBzdHJ1Y3QgQ2hhbm5lbE1hcENvbnRleHQgewogICAgIGNvbnN0IEFWQ2xhc3MgKmNsYXNz OwogICAgIGNoYXIgKm1hcHBpbmdfc3RyOwotICAgIGNoYXIgKmNoYW5uZWxfbGF5b3V0X3N0cjsK ICAgICBBVkNoYW5uZWxMYXlvdXQgb3V0cHV0X2xheW91dDsKICAgICBzdHJ1Y3QgQ2hhbm5lbE1h cCBtYXBbTUFYX0NIXTsKICAgICBpbnQgbmNoOwpAQCAtNzIsNyArNzEsNyBAQCBzdGF0aWMgY29u c3QgQVZPcHRpb24gY2hhbm5lbG1hcF9vcHRpb25zW10gPSB7CiAgICAgeyAibWFwIiwgIkEgY29t bWEtc2VwYXJhdGVkIGxpc3Qgb2YgaW5wdXQgY2hhbm5lbCBudW1iZXJzIGluIG91dHB1dCBvcmRl ci4iLAogICAgICAgICAgIE9GRlNFVChtYXBwaW5nX3N0ciksICAgICAgICBBVl9PUFRfVFlQRV9T VFJJTkcsIC5mbGFncyA9IEF8RiB9LAogICAgIHsgImNoYW5uZWxfbGF5b3V0IiwgIk91dHB1dCBj aGFubmVsIGxheW91dC4iLAotICAgICAgICAgIE9GRlNFVChjaGFubmVsX2xheW91dF9zdHIpLCBB Vl9PUFRfVFlQRV9TVFJJTkcsIC5mbGFncyA9IEF8RiB9LAorICAgICAgICAgIE9GRlNFVChvdXRw dXRfbGF5b3V0KSwgICAgICBBVl9PUFRfVFlQRV9DSExBWU9VVCwgLmZsYWdzID0gQXxGIH0sCiAg ICAgeyBOVUxMIH0KIH07CiAKQEAgLTEyMiw3ICsxMjEsNiBAQCBzdGF0aWMgYXZfY29sZCBpbnQg Y2hhbm5lbG1hcF9pbml0KEFWRmlsdGVyQ29udGV4dCAqY3R4KQogICAgIENoYW5uZWxNYXBDb250 ZXh0ICpzID0gY3R4LT5wcml2OwogICAgIGNoYXIgKm1hcHBpbmcsIHNlcGFyYXRvciA9ICd8JzsK ICAgICBpbnQgbWFwX2VudHJpZXMgPSAwOwotICAgIGNoYXIgYnVmWzI1Nl07CiAgICAgZW51bSBN YXBwaW5nTW9kZSBtb2RlOwogICAgIHVpbnQ2NF90IG91dF9jaF9tYXNrID0gMDsKICAgICBpbnQg aTsKQEAgLTIzNSw0NyArMjMzLDIyIEBAIHN0YXRpYyBhdl9jb2xkIGludCBjaGFubmVsbWFwX2lu aXQoQVZGaWx0ZXJDb250ZXh0ICpjdHgpCiAgICAgZWxzZQogICAgICAgICBhdl9jaGFubmVsX2xh eW91dF9kZWZhdWx0KCZzLT5vdXRwdXRfbGF5b3V0LCBtYXBfZW50cmllcyk7CiAKLSAgICBpZiAo cy0+Y2hhbm5lbF9sYXlvdXRfc3RyKSB7Ci0gICAgICAgIEFWQ2hhbm5lbExheW91dCBmbXQgPSB7 IDAgfTsKLSAgICAgICAgaW50IHJldDsKLSAgICAgICAgaWYgKChyZXQgPSBhdl9jaGFubmVsX2xh eW91dF9mcm9tX3N0cmluZygmZm10LCBzLT5jaGFubmVsX2xheW91dF9zdHIpKSA8IDApIHsKLSNp ZiBGRl9BUElfT0xEX0NIQU5ORUxfTEFZT1VUCi0gICAgICAgICAgICB1aW50NjRfdCBtYXNrOwot RkZfRElTQUJMRV9ERVBSRUNBVElPTl9XQVJOSU5HUwotICAgICAgICAgICAgaWYgKChtYXNrID0g YXZfZ2V0X2NoYW5uZWxfbGF5b3V0KHMtPmNoYW5uZWxfbGF5b3V0X3N0cikpID09IDApIHsKLSNl bmRpZgotICAgICAgICAgICAgICAgIGF2X2xvZyhjdHgsIEFWX0xPR19FUlJPUiwgIkVycm9yIHBh cnNpbmcgY2hhbm5lbCBsYXlvdXQ6ICclcycuXG4iLAotICAgICAgICAgICAgICAgICAgICAgICBz LT5jaGFubmVsX2xheW91dF9zdHIpOwotICAgICAgICAgICAgICAgIHJldHVybiBBVkVSUk9SKEVJ TlZBTCk7Ci0jaWYgRkZfQVBJX09MRF9DSEFOTkVMX0xBWU9VVAotICAgICAgICAgICAgfQotRkZf RU5BQkxFX0RFUFJFQ0FUSU9OX1dBUk5JTkdTCi0gICAgICAgICAgICBhdl9sb2coY3R4LCBBVl9M T0dfV0FSTklORywgIkNoYW5uZWwgbGF5b3V0ICclcycgdXNlcyBhIGRlcHJlY2F0ZWQgc3ludGF4 LlxuIiwKLSAgICAgICAgICAgICAgICAgICBzLT5jaGFubmVsX2xheW91dF9zdHIpOwotICAgICAg ICAgICAgYXZfY2hhbm5lbF9sYXlvdXRfZnJvbV9tYXNrKCZmbXQsIG1hc2spOwotI2VuZGlmCi0g ICAgICAgIH0KLSAgICAgICAgaWYgKG1vZGUgPT0gTUFQX05PTkUpIHsKLSAgICAgICAgICAgIGlu dCBpOwotICAgICAgICAgICAgcy0+bmNoID0gZm10Lm5iX2NoYW5uZWxzOwotICAgICAgICAgICAg Zm9yIChpID0gMDsgaSA8IHMtPm5jaDsgaSsrKSB7Ci0gICAgICAgICAgICAgICAgcy0+bWFwW2ld LmluX2NoYW5uZWxfaWR4ICA9IGk7Ci0gICAgICAgICAgICAgICAgcy0+bWFwW2ldLm91dF9jaGFu bmVsX2lkeCA9IGk7Ci0gICAgICAgICAgICB9Ci0gICAgICAgIH0gZWxzZSBpZiAob3V0X2NoX21h c2sgJiYgYXZfY2hhbm5lbF9sYXlvdXRfY29tcGFyZSgmcy0+b3V0cHV0X2xheW91dCwgJmZtdCkp IHsKLSAgICAgICAgICAgIGF2X2NoYW5uZWxfbGF5b3V0X2Rlc2NyaWJlKCZzLT5vdXRwdXRfbGF5 b3V0LCBidWYsIHNpemVvZihidWYpKTsKLSAgICAgICAgICAgIGF2X2xvZyhjdHgsIEFWX0xPR19F UlJPUiwKLSAgICAgICAgICAgICAgICAgICAiT3V0cHV0IGNoYW5uZWwgbGF5b3V0ICclcycgZG9l cyBub3QgbWF0Y2ggdGhlIGxpc3Qgb2YgY2hhbm5lbCBtYXBwZWQ6ICclcycuXG4iLAotICAgICAg ICAgICAgICAgICAgIHMtPmNoYW5uZWxfbGF5b3V0X3N0ciwgYnVmKTsKLSAgICAgICAgICAgIHJl dHVybiBBVkVSUk9SKEVJTlZBTCk7Ci0gICAgICAgIH0gZWxzZSBpZiAocy0+bmNoICE9IGZtdC5u Yl9jaGFubmVscykgewotICAgICAgICAgICAgYXZfbG9nKGN0eCwgQVZfTE9HX0VSUk9SLAotICAg ICAgICAgICAgICAgICAgICJPdXRwdXQgY2hhbm5lbCBsYXlvdXQgJXMgZG9lcyBub3QgbWF0Y2gg dGhlIG51bWJlciBvZiBjaGFubmVscyBtYXBwZWQgJWQuXG4iLAotICAgICAgICAgICAgICAgICAg IHMtPmNoYW5uZWxfbGF5b3V0X3N0ciwgcy0+bmNoKTsKLSAgICAgICAgICAgIHJldHVybiBBVkVS Uk9SKEVJTlZBTCk7CisgICAgaWYgKG1vZGUgPT0gTUFQX05PTkUpIHsKKyAgICAgICAgaW50IGk7 CisgICAgICAgIHMtPm5jaCA9IHMtPm91dHB1dF9sYXlvdXQubmJfY2hhbm5lbHM7CisgICAgICAg IGZvciAoaSA9IDA7IGkgPCBzLT5uY2g7IGkrKykgeworICAgICAgICAgICAgcy0+bWFwW2ldLmlu X2NoYW5uZWxfaWR4ICA9IGk7CisgICAgICAgICAgICBzLT5tYXBbaV0ub3V0X2NoYW5uZWxfaWR4 ID0gaTsKICAgICAgICAgfQotICAgICAgICBzLT5vdXRwdXRfbGF5b3V0ID0gZm10OworICAgIH0g ZWxzZSBpZiAocy0+bmNoICE9IHMtPm91dHB1dF9sYXlvdXQubmJfY2hhbm5lbHMpIHsKKyAgICAg ICAgY2hhciBidWZbMjU2XTsKKyAgICAgICAgYXZfY2hhbm5lbF9sYXlvdXRfZGVzY3JpYmUoJnMt Pm91dHB1dF9sYXlvdXQsIGJ1Ziwgc2l6ZW9mKGJ1ZikpOworICAgICAgICBhdl9sb2coY3R4LCBB Vl9MT0dfRVJST1IsCisgICAgICAgICAgICAgICAiT3V0cHV0IGNoYW5uZWwgbGF5b3V0ICVzIGRv ZXMgbm90IG1hdGNoIHRoZSBudW1iZXIgb2YgY2hhbm5lbHMgbWFwcGVkICVkLlxuIiwKKyAgICAg ICAgICAgICAgIGJ1Ziwgcy0+bmNoKTsKKyAgICAgICAgcmV0dXJuIEFWRVJST1IoRUlOVkFMKTsK ICAgICB9CisKICAgICBpZiAoIXMtPm91dHB1dF9sYXlvdXQubmJfY2hhbm5lbHMpIHsKICAgICAg ICAgYXZfbG9nKGN0eCwgQVZfTE9HX0VSUk9SLCAiT3V0cHV0IGNoYW5uZWwgbGF5b3V0IGlzIG5v dCBzZXQgYW5kICIKICAgICAgICAgICAgICAgICJjYW5ub3QgYmUgZ3Vlc3NlZCBmcm9tIHRoZSBt YXBzLlxuIik7CmRpZmYgLS1naXQgYS9saWJhdmZpbHRlci9hZl9jaGFubmVsc3BsaXQuYyBiL2xp YmF2ZmlsdGVyL2FmX2NoYW5uZWxzcGxpdC5jCmluZGV4IGJkNGFmZmYxMjIuLjkzMmI1MWQ3MDEg MTAwNjQ0Ci0tLSBhL2xpYmF2ZmlsdGVyL2FmX2NoYW5uZWxzcGxpdC5jCisrKyBiL2xpYmF2Zmls dGVyL2FmX2NoYW5uZWxzcGxpdC5jCkBAIC00MCw3ICs0MCw2IEBAIHR5cGVkZWYgc3RydWN0IENo YW5uZWxTcGxpdENvbnRleHQgewogICAgIGNvbnN0IEFWQ2xhc3MgKmNsYXNzOwogCiAgICAgQVZD aGFubmVsTGF5b3V0IGNoYW5uZWxfbGF5b3V0OwotICAgIGNoYXIgICAgKmNoYW5uZWxfbGF5b3V0 X3N0cjsKICAgICBjaGFyICAgICpjaGFubmVsc19zdHI7CiAKICAgICBpbnQgICAgICBtYXBbNjRd OwpAQCAtNTAsNyArNDksNyBAQCB0eXBlZGVmIHN0cnVjdCBDaGFubmVsU3BsaXRDb250ZXh0IHsK ICNkZWZpbmUgQSBBVl9PUFRfRkxBR19BVURJT19QQVJBTQogI2RlZmluZSBGIEFWX09QVF9GTEFH X0ZJTFRFUklOR19QQVJBTQogc3RhdGljIGNvbnN0IEFWT3B0aW9uIGNoYW5uZWxzcGxpdF9vcHRp b25zW10gPSB7Ci0gICAgeyAiY2hhbm5lbF9sYXlvdXQiLCAiSW5wdXQgY2hhbm5lbCBsYXlvdXQu IiwgT0ZGU0VUKGNoYW5uZWxfbGF5b3V0X3N0ciksIEFWX09QVF9UWVBFX1NUUklORywgeyAuc3Ry ID0gInN0ZXJlbyIgfSwgLmZsYWdzID0gQXxGIH0sCisgICAgeyAiY2hhbm5lbF9sYXlvdXQiLCAi SW5wdXQgY2hhbm5lbCBsYXlvdXQuIiwgT0ZGU0VUKGNoYW5uZWxfbGF5b3V0KSwgICBBVl9PUFRf VFlQRV9DSExBWU9VVCwgeyAuc3RyID0gInN0ZXJlbyIgfSwgLmZsYWdzID0gQXxGIH0sCiAgICAg eyAiY2hhbm5lbHMiLCAgICAgICAgIkNoYW5uZWxzIHRvIGV4dHJhY3QuIiwgT0ZGU0VUKGNoYW5u ZWxzX3N0ciksICAgICAgIEFWX09QVF9UWVBFX1NUUklORywgeyAuc3RyID0gImFsbCIgfSwgICAg LmZsYWdzID0gQXxGIH0sCiAgICAgeyBOVUxMIH0KIH07CkBAIC02MywxMyArNjIsNiBAQCBzdGF0 aWMgYXZfY29sZCBpbnQgaW5pdChBVkZpbHRlckNvbnRleHQgKmN0eCkKICAgICBBVkNoYW5uZWxM YXlvdXQgY2hhbm5lbF9sYXlvdXQgPSB7IDAgfTsKICAgICBpbnQgYWxsID0gMCwgcmV0ID0gMCwg aTsKIAotICAgIGlmICgocmV0ID0gYXZfY2hhbm5lbF9sYXlvdXRfZnJvbV9zdHJpbmcoJnMtPmNo YW5uZWxfbGF5b3V0LCBzLT5jaGFubmVsX2xheW91dF9zdHIpKSA8IDApIHsKLSAgICAgICAgYXZf bG9nKGN0eCwgQVZfTE9HX0VSUk9SLCAiRXJyb3IgcGFyc2luZyBjaGFubmVsIGxheW91dCAnJXMn LlxuIiwKLSAgICAgICAgICAgICAgIHMtPmNoYW5uZWxfbGF5b3V0X3N0cik7Ci0gICAgICAgIHJl dCA9IEFWRVJST1IoRUlOVkFMKTsKLSAgICAgICAgZ290byBmYWlsOwotICAgIH0KLQogICAgIGlm ICghc3RyY21wKHMtPmNoYW5uZWxzX3N0ciwgImFsbCIpKSB7CiAgICAgICAgIGlmICgocmV0ID0g YXZfY2hhbm5lbF9sYXlvdXRfY29weSgmY2hhbm5lbF9sYXlvdXQsICZzLT5jaGFubmVsX2xheW91 dCkpIDwgMCkKICAgICAgICAgICAgIGdvdG8gZmFpbDsKQEAgLTEwMCw5ICs5MiwxMSBAQCBzdGF0 aWMgYXZfY29sZCBpbnQgaW5pdChBVkZpbHRlckNvbnRleHQgKmN0eCkKICAgICAgICAgaWYgKGFs bCkgewogICAgICAgICAgICAgcy0+bWFwW2ldID0gaTsKICAgICAgICAgfSBlbHNlIHsKKyAgICAg ICAgICAgIGNoYXIgYnVmWzEyOF07CisgICAgICAgICAgICBhdl9jaGFubmVsX2xheW91dF9kZXNj cmliZSgmcy0+Y2hhbm5lbF9sYXlvdXQsIGJ1Ziwgc2l6ZW9mKGJ1ZikpOwogICAgICAgICAgICAg aWYgKChyZXQgPSBhdl9jaGFubmVsX2xheW91dF9pbmRleF9mcm9tX2NoYW5uZWwoJnMtPmNoYW5u ZWxfbGF5b3V0LCBjaGFubmVsKSkgPCAwKSB7CiAgICAgICAgICAgICAgICAgYXZfbG9nKGN0eCwg QVZfTE9HX0VSUk9SLCAiQ2hhbm5lbCBuYW1lICclcycgbm90IHByZXNlbnQgaW4gY2hhbm5lbCBs YXlvdXQgJyVzJy5cbiIsCi0gICAgICAgICAgICAgICAgICAgICAgIHBhZC5uYW1lLCBzLT5jaGFu bmVsX2xheW91dF9zdHIpOworICAgICAgICAgICAgICAgICAgICAgICBwYWQubmFtZSwgYnVmKTsK ICAgICAgICAgICAgICAgICBhdl9mcmVlcCgmcGFkLm5hbWUpOwogICAgICAgICAgICAgICAgIGdv dG8gZmFpbDsKICAgICAgICAgICAgIH0KZGlmZiAtLWdpdCBhL2xpYmF2ZmlsdGVyL2FmX2pvaW4u YyBiL2xpYmF2ZmlsdGVyL2FmX2pvaW4uYwppbmRleCA1ZGJmOWQ4ZDIyLi40MTZjZmQ3YTlhIDEw MDY0NAotLS0gYS9saWJhdmZpbHRlci9hZl9qb2luLmMKKysrIGIvbGliYXZmaWx0ZXIvYWZfam9p bi5jCkBAIC00OCw3ICs0OCw2IEBAIHR5cGVkZWYgc3RydWN0IEpvaW5Db250ZXh0IHsKIAogICAg IGludCBpbnB1dHM7CiAgICAgY2hhciAqbWFwOwotICAgIGNoYXIgICAgKmNoYW5uZWxfbGF5b3V0 X3N0cjsKICAgICBBVkNoYW5uZWxMYXlvdXQgY2hfbGF5b3V0OwogCiAgICAgaW50NjRfdCAgZW9m X3B0czsKQEAgLTczLDcgKzcyLDcgQEAgdHlwZWRlZiBzdHJ1Y3QgSm9pbkNvbnRleHQgewogc3Rh dGljIGNvbnN0IEFWT3B0aW9uIGpvaW5fb3B0aW9uc1tdID0gewogICAgIHsgImlucHV0cyIsICAg ICAgICAgIk51bWJlciBvZiBpbnB1dCBzdHJlYW1zLiIsIE9GRlNFVChpbnB1dHMpLCAgICAgICAg ICAgICBBVl9PUFRfVFlQRV9JTlQsICAgIHsgLmk2NCA9IDIgfSwgMSwgSU5UX01BWCwgICAgICAg QXxGIH0sCiAgICAgeyAiY2hhbm5lbF9sYXlvdXQiLCAiQ2hhbm5lbCBsYXlvdXQgb2YgdGhlICIK LSAgICAgICAgICAgICAgICAgICAgICAgICJvdXRwdXQgc3RyZWFtLiIsICAgICAgICAgICBPRkZT RVQoY2hhbm5lbF9sYXlvdXRfc3RyKSwgQVZfT1BUX1RZUEVfU1RSSU5HLCB7LnN0ciA9ICJzdGVy ZW8ifSwgMCwgMCwgQXxGIH0sCisgICAgICAgICAgICAgICAgICAgICAgICAib3V0cHV0IHN0cmVh bS4iLCAgICAgICAgICAgT0ZGU0VUKGNoX2xheW91dCksICAgICAgICAgIEFWX09QVF9UWVBFX0NI TEFZT1VULCB7LnN0ciA9ICJzdGVyZW8ifSwgMCwgMCwgQXxGIH0sCiAgICAgeyAibWFwIiwgICAg ICAgICAgICAiQSBjb21tYS1zZXBhcmF0ZWQgbGlzdCBvZiBjaGFubmVscyBtYXBzIGluIHRoZSBm b3JtYXQgIgogICAgICAgICAgICAgICAgICAgICAgICAgIidpbnB1dF9zdHJlYW0uaW5wdXRfY2hh bm5lbC1vdXRwdXRfY2hhbm5lbC4iLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIE9GRlNFVChtYXApLCAgICAgICAgICAgICAgICBBVl9PUFRfVFlQ RV9TVFJJTkcsICAgICAgICAgICAgICAgICAuZmxhZ3MgPSBBfEYgfSwKQEAgLTE1NywyNiArMTU2 LDYgQEAgc3RhdGljIGF2X2NvbGQgaW50IGpvaW5faW5pdChBVkZpbHRlckNvbnRleHQgKmN0eCkK ICAgICBKb2luQ29udGV4dCAqcyA9IGN0eC0+cHJpdjsKICAgICBpbnQgcmV0LCBpOwogCi0gICAg cmV0ID0gYXZfY2hhbm5lbF9sYXlvdXRfZnJvbV9zdHJpbmcoJnMtPmNoX2xheW91dCwgcy0+Y2hh bm5lbF9sYXlvdXRfc3RyKTsKLSAgICBpZiAocmV0IDwgMCkgewotI2lmIEZGX0FQSV9PTERfQ0hB Tk5FTF9MQVlPVVQKLSAgICAgICAgdWludDY0X3QgbWFzazsKLUZGX0RJU0FCTEVfREVQUkVDQVRJ T05fV0FSTklOR1MKLSAgICAgICAgbWFzayA9IGF2X2dldF9jaGFubmVsX2xheW91dChzLT5jaGFu bmVsX2xheW91dF9zdHIpOwotICAgICAgICBpZiAoIW1hc2spIHsKLSNlbmRpZgotICAgICAgICAg ICAgYXZfbG9nKGN0eCwgQVZfTE9HX0VSUk9SLCAiRXJyb3IgcGFyc2luZyBjaGFubmVsIGxheW91 dCAnJXMnLlxuIiwKLSAgICAgICAgICAgICAgICAgICBzLT5jaGFubmVsX2xheW91dF9zdHIpOwot ICAgICAgICAgICAgcmV0dXJuIEFWRVJST1IoRUlOVkFMKTsKLSNpZiBGRl9BUElfT0xEX0NIQU5O RUxfTEFZT1VUCi0gICAgICAgIH0KLUZGX0VOQUJMRV9ERVBSRUNBVElPTl9XQVJOSU5HUwotICAg ICAgICBhdl9sb2coY3R4LCBBVl9MT0dfV0FSTklORywgIkNoYW5uZWwgbGF5b3V0ICclcycgdXNl cyBhIGRlcHJlY2F0ZWQgc3ludGF4LlxuIiwKLSAgICAgICAgICAgICAgIHMtPmNoYW5uZWxfbGF5 b3V0X3N0cik7Ci0gICAgICAgIGF2X2NoYW5uZWxfbGF5b3V0X2Zyb21fbWFzaygmcy0+Y2hfbGF5 b3V0LCBtYXNrKTsKLSNlbmRpZgotICAgIH0KLQogICAgIHMtPmNoYW5uZWxzICAgICA9IGF2X2Nh bGxvYyhzLT5jaF9sYXlvdXQubmJfY2hhbm5lbHMsIHNpemVvZigqcy0+Y2hhbm5lbHMpKTsKICAg ICBzLT5idWZmZXJzICAgICAgPSBhdl9jYWxsb2Mocy0+Y2hfbGF5b3V0Lm5iX2NoYW5uZWxzLCBz aXplb2YoKnMtPmJ1ZmZlcnMpKTsKICAgICBzLT5pbnB1dF9mcmFtZXMgPSBhdl9jYWxsb2Mocy0+ aW5wdXRzLCBzaXplb2YoKnMtPmlucHV0X2ZyYW1lcykpOwpkaWZmIC0tZ2l0IGEvbGliYXZmaWx0 ZXIvYWZfc3Vycm91bmQuYyBiL2xpYmF2ZmlsdGVyL2FmX3N1cnJvdW5kLmMKaW5kZXggMzM5OGMy NTQ0Ni4uNzlkZjg2MDgxYyAxMDA2NDQKLS0tIGEvbGliYXZmaWx0ZXIvYWZfc3Vycm91bmQuYwor KysgYi9saWJhdmZpbHRlci9hZl9zdXJyb3VuZC5jCkBAIC02MSw4ICs2MSw4IEBAIHN0YXRpYyBj b25zdCBpbnQgc2NfbWFwWzE2XSA9IHsKIHR5cGVkZWYgc3RydWN0IEF1ZGlvU3Vycm91bmRDb250 ZXh0IHsKICAgICBjb25zdCBBVkNsYXNzICpjbGFzczsKIAotICAgIGNoYXIgKm91dF9jaGFubmVs X2xheW91dF9zdHI7Ci0gICAgY2hhciAqaW5fY2hhbm5lbF9sYXlvdXRfc3RyOworICAgIEFWQ2hh bm5lbExheW91dCBvdXRfY2hfbGF5b3V0OworICAgIEFWQ2hhbm5lbExheW91dCBpbl9jaF9sYXlv dXQ7CiAKICAgICBmbG9hdCBsZXZlbF9pbjsKICAgICBmbG9hdCBsZXZlbF9vdXQ7CkBAIC05Myw4 ICs5Myw2IEBAIHR5cGVkZWYgc3RydWN0IEF1ZGlvU3Vycm91bmRDb250ZXh0IHsKICAgICBmbG9h dCBsb3djdXQ7CiAgICAgZmxvYXQgaGlnaGN1dDsKIAotICAgIEFWQ2hhbm5lbExheW91dCBvdXRf Y2hfbGF5b3V0OwotICAgIEFWQ2hhbm5lbExheW91dCBpbl9jaF9sYXlvdXQ7CiAgICAgaW50IG5i X2luX2NoYW5uZWxzOwogICAgIGludCBuYl9vdXRfY2hhbm5lbHM7CiAKQEAgLTExMDcsMjAgKzEx MDUsOCBAQCBzdGF0aWMgYXZfY29sZCBpbnQgaW5pdChBVkZpbHRlckNvbnRleHQgKmN0eCkKIHsK ICAgICBBdWRpb1N1cnJvdW5kQ29udGV4dCAqcyA9IGN0eC0+cHJpdjsKICAgICBpbnQ2NF90IGlu X2NoYW5uZWxfbGF5b3V0LCBvdXRfY2hhbm5lbF9sYXlvdXQ7CisgICAgY2hhciBpbl9uYW1lWzEy OF0sIG91dF9uYW1lWzEyOF07CiAgICAgZmxvYXQgb3ZlcmxhcDsKLSAgICBpbnQgcmV0OwotCi0g ICAgaWYgKChyZXQgPSBhdl9jaGFubmVsX2xheW91dF9mcm9tX3N0cmluZygmcy0+b3V0X2NoX2xh eW91dCwgcy0+b3V0X2NoYW5uZWxfbGF5b3V0X3N0cikpIDwgMCkgewotICAgICAgICBhdl9sb2co Y3R4LCBBVl9MT0dfRVJST1IsICJFcnJvciBwYXJzaW5nIG91dHB1dCBjaGFubmVsIGxheW91dCAn JXMnLlxuIiwKLSAgICAgICAgICAgICAgIHMtPm91dF9jaGFubmVsX2xheW91dF9zdHIpOwotICAg ICAgICByZXR1cm4gcmV0OwotICAgIH0KLQotICAgIGlmICgocmV0ID0gYXZfY2hhbm5lbF9sYXlv dXRfZnJvbV9zdHJpbmcoJnMtPmluX2NoX2xheW91dCwgcy0+aW5fY2hhbm5lbF9sYXlvdXRfc3Ry KSkgPCAwKSB7Ci0gICAgICAgIGF2X2xvZyhjdHgsIEFWX0xPR19FUlJPUiwgIkVycm9yIHBhcnNp bmcgaW5wdXQgY2hhbm5lbCBsYXlvdXQgJyVzJy5cbiIsCi0gICAgICAgICAgICAgICBzLT5pbl9j aGFubmVsX2xheW91dF9zdHIpOwotICAgICAgICByZXR1cm4gQVZFUlJPUihFSU5WQUwpOwotICAg IH0KIAogICAgIGlmIChzLT5sb3djdXRmID49IHMtPmhpZ2hjdXRmKSB7CiAgICAgICAgIGF2X2xv ZyhjdHgsIEFWX0xPR19FUlJPUiwgIkxvdyBjdXQtb2ZmICclZCcgc2hvdWxkIGJlIGxlc3MgdGhh biBoaWdoIGN1dC1vZmYgJyVkJy5cbiIsCkBAIC0xMTgxLDggKzExNjcsMTAgQEAgc3RhdGljIGF2 X2NvbGQgaW50IGluaXQoQVZGaWx0ZXJDb250ZXh0ICpjdHgpCiAgICAgICAgIGJyZWFrOwogICAg IGRlZmF1bHQ6CiBmYWlsOgorICAgICAgICBhdl9jaGFubmVsX2xheW91dF9kZXNjcmliZSgmcy0+ b3V0X2NoX2xheW91dCwgb3V0X25hbWUsIHNpemVvZihvdXRfbmFtZSkpOworICAgICAgICBhdl9j aGFubmVsX2xheW91dF9kZXNjcmliZSgmcy0+aW5fY2hfbGF5b3V0LCBpbl9uYW1lLCBzaXplb2Yo aW5fbmFtZSkpOwogICAgICAgICBhdl9sb2coY3R4LCBBVl9MT0dfRVJST1IsICJVbnN1cHBvcnRl ZCB1cG1peDogJyVzJyAtPiAnJXMnLlxuIiwKLSAgICAgICAgICAgICAgIHMtPmluX2NoYW5uZWxf bGF5b3V0X3N0ciwgcy0+b3V0X2NoYW5uZWxfbGF5b3V0X3N0cik7CisgICAgICAgICAgICAgICBp bl9uYW1lLCBvdXRfbmFtZSk7CiAgICAgICAgIHJldHVybiBBVkVSUk9SKEVJTlZBTCk7CiAgICAg fQogCkBAIC0xNDE3LDggKzE0MDUsOCBAQCBzdGF0aWMgaW50IHByb2Nlc3NfY29tbWFuZChBVkZp bHRlckNvbnRleHQgKmN0eCwgY29uc3QgY2hhciAqY21kLCBjb25zdCBjaGFyICphcgogI2RlZmlu ZSBURkxBR1MgQVZfT1BUX0ZMQUdfQVVESU9fUEFSQU18QVZfT1BUX0ZMQUdfRklMVEVSSU5HX1BB UkFNfEFWX09QVF9GTEFHX1JVTlRJTUVfUEFSQU0KIAogc3RhdGljIGNvbnN0IEFWT3B0aW9uIHN1 cnJvdW5kX29wdGlvbnNbXSA9IHsKLSAgICB7ICJjaGxfb3V0IiwgICAic2V0IG91dHB1dCBjaGFu bmVsIGxheW91dCIsIE9GRlNFVChvdXRfY2hhbm5lbF9sYXlvdXRfc3RyKSwgQVZfT1BUX1RZUEVf U1RSSU5HLCB7LnN0cj0iNS4xIn0sIDAsICAgMCwgRkxBR1MgfSwKLSAgICB7ICJjaGxfaW4iLCAg ICAic2V0IGlucHV0IGNoYW5uZWwgbGF5b3V0IiwgIE9GRlNFVChpbl9jaGFubmVsX2xheW91dF9z dHIpLCAgQVZfT1BUX1RZUEVfU1RSSU5HLCB7LnN0cj0ic3RlcmVvIn0sMCwgMCwgRkxBR1MgfSwK KyAgICB7ICJjaGxfb3V0IiwgICAic2V0IG91dHB1dCBjaGFubmVsIGxheW91dCIsIE9GRlNFVChv dXRfY2hfbGF5b3V0KSwgICAgICAgICAgQVZfT1BUX1RZUEVfQ0hMQVlPVVQsIHsuc3RyPSI1LjEi fSwgMCwgICAwLCBGTEFHUyB9LAorICAgIHsgImNobF9pbiIsICAgICJzZXQgaW5wdXQgY2hhbm5l bCBsYXlvdXQiLCAgT0ZGU0VUKGluX2NoX2xheW91dCksICAgICAgICAgICBBVl9PUFRfVFlQRV9D SExBWU9VVCwgey5zdHI9InN0ZXJlbyJ9LDAsIDAsIEZMQUdTIH0sCiAgICAgeyAibGV2ZWxfaW4i LCAgInNldCBpbnB1dCBsZXZlbCIsICAgICAgICAgICBPRkZTRVQobGV2ZWxfaW4pLCAgICAgICAg ICAgICAgIEFWX09QVF9UWVBFX0ZMT0FULCAgey5kYmw9MX0sICAgICAwLCAgMTAsIFRGTEFHUyB9 LAogICAgIHsgImxldmVsX291dCIsICJzZXQgb3V0cHV0IGxldmVsIiwgICAgICAgICAgT0ZGU0VU KGxldmVsX291dCksICAgICAgICAgICAgICBBVl9PUFRfVFlQRV9GTE9BVCwgIHsuZGJsPTF9LCAg ICAgMCwgIDEwLCBURkxBR1MgfSwKICAgICB7ICJsZmUiLCAgICAgICAib3V0cHV0IExGRSIsICAg ICAgICAgICAgICAgIE9GRlNFVChvdXRwdXRfbGZlKSwgICAgICAgICAgICAgQVZfT1BUX1RZUEVf Qk9PTCwgICB7Lmk2ND0xfSwgICAgIDAsICAgMSwgVEZMQUdTIH0sCmRpZmYgLS1naXQgYS9saWJh dmZpbHRlci9hc3JjX2FmZGVsYXlzcmMuYyBiL2xpYmF2ZmlsdGVyL2FzcmNfYWZkZWxheXNyYy5j CmluZGV4IGE3ZDI1YzUzMDkuLmYzZjBiMDgwYTAgMTAwNjQ0Ci0tLSBhL2xpYmF2ZmlsdGVyL2Fz cmNfYWZkZWxheXNyYy5jCisrKyBiL2xpYmF2ZmlsdGVyL2FzcmNfYWZkZWxheXNyYy5jCkBAIC0z NiwyMyArMzYsMTAgQEAgdHlwZWRlZiBzdHJ1Y3QgQUZEZWxheVNyY0NvbnRleHQgewogICAgIGlu dCBuYl9zYW1wbGVzOwogICAgIGludCBuYl90YXBzOwogICAgIEFWQ2hhbm5lbExheW91dCBjaGxh eW91dDsKLSAgICBjaGFyICpjaGxheW91dF9zdHI7CiAKICAgICBpbnQ2NF90IHB0czsKIH0gQUZE ZWxheVNyY0NvbnRleHQ7CiAKLXN0YXRpYyBhdl9jb2xkIGludCBpbml0KEFWRmlsdGVyQ29udGV4 dCAqY3R4KQotewotICAgIEFGRGVsYXlTcmNDb250ZXh0ICpzID0gY3R4LT5wcml2OwotICAgIGlu dCByZXQ7Ci0KLSAgICByZXQgPSBmZl9wYXJzZV9jaGFubmVsX2xheW91dCgmcy0+Y2hsYXlvdXQs IE5VTEwsIHMtPmNobGF5b3V0X3N0ciwgY3R4KTsKLSAgICBpZiAocmV0IDwgMCkKLSAgICAgICAg cmV0dXJuIHJldDsKLQotICAgIHJldHVybiAwOwotfQotCiBzdGF0aWMgZmxvYXQgc2luY2YoZmxv YXQgeCkKIHsKICAgICBpZiAoeCA9PSAwLmYpCkBAIC0xMzQsMTMgKzEyMSw2IEBAIHN0YXRpYyBj b25zdCBBVkZpbHRlclBhZCBhZmRlbGF5c3JjX291dHB1dHNbXSA9IHsKICAgICB9LAogfTsKIAot c3RhdGljIGF2X2NvbGQgdm9pZCB1bmluaXQoQVZGaWx0ZXJDb250ZXh0ICpjdHgpCi17Ci0gICAg QUZEZWxheVNyY0NvbnRleHQgKnMgPSBjdHgtPnByaXY7Ci0KLSAgICBhdl9jaGFubmVsX2xheW91 dF91bmluaXQoJnMtPmNobGF5b3V0KTsKLX0KLQogI2RlZmluZSBBRiBBVl9PUFRfRkxBR19BVURJ T19QQVJBTXxBVl9PUFRfRkxBR19GSUxURVJJTkdfUEFSQU0KICNkZWZpbmUgT0ZGU0VUKHgpIG9m ZnNldG9mKEFGRGVsYXlTcmNDb250ZXh0LCB4KQogCkBAIC0xNTMsOCArMTMzLDggQEAgc3RhdGlj IGNvbnN0IEFWT3B0aW9uIGFmZGVsYXlzcmNfb3B0aW9uc1tdID0gewogICAgIHsgIm4iLCAgICAg ICAgICAgInNldCB0aGUgbnVtYmVyIG9mIHNhbXBsZXMgcGVyIHJlcXVlc3RlZCBmcmFtZSIsIE9G RlNFVChuYl9zYW1wbGVzKSwgIEFWX09QVF9UWVBFX0lOVCwgICB7Lmk2ND0xMDI0fSwgICAxLCBJ TlRfTUFYLCAgIEFGIH0sCiAgICAgeyAidGFwcyIsICAgICAgICAic2V0IG51bWJlciBvZiB0YXBz IGZvciBkZWxheSBmaWx0ZXIiLCAgICAgICAgICAgT0ZGU0VUKG5iX3RhcHMpLCAgICAgQVZfT1BU X1RZUEVfSU5ULCAgIHsuaTY0PTB9LCAgICAgIDAsICAgMzI3NjgsICAgQUYgfSwKICAgICB7ICJ0 IiwgICAgICAgICAgICJzZXQgbnVtYmVyIG9mIHRhcHMgZm9yIGRlbGF5IGZpbHRlciIsICAgICAg ICAgICBPRkZTRVQobmJfdGFwcyksICAgICBBVl9PUFRfVFlQRV9JTlQsICAgey5pNjQ9MH0sICAg ICAgMCwgICAzMjc2OCwgICBBRiB9LAotICAgIHsgImNoYW5uZWxfbGF5b3V0IiwgInNldCBjaGFu bmVsIGxheW91dCIsICAgICAgICAgICAgICAgICAgICAgICAgIE9GRlNFVChjaGxheW91dF9zdHIp LEFWX09QVF9UWVBFX1NUUklORyx7LnN0cj0ic3RlcmVvIn0sMCwgICAgICAwLCAgIEFGIH0sCi0g ICAgeyAiYyIsICAgICAgICAgICAgICAic2V0IGNoYW5uZWwgbGF5b3V0IiwgICAgICAgICAgICAg ICAgICAgICAgICAgT0ZGU0VUKGNobGF5b3V0X3N0ciksQVZfT1BUX1RZUEVfU1RSSU5HLHsuc3Ry PSJzdGVyZW8ifSwwLCAgICAgIDAsICAgQUYgfSwKKyAgICB7ICJjaGFubmVsX2xheW91dCIsICJz ZXQgY2hhbm5lbCBsYXlvdXQiLCAgICAgICAgICAgICAgICAgICAgICAgICBPRkZTRVQoY2hsYXlv dXQpLCAgICBBVl9PUFRfVFlQRV9DSExBWU9VVCx7LnN0cj0ic3RlcmVvIn0sMCwgICAgICAwLCAg IEFGIH0sCisgICAgeyAiYyIsICAgICAgICAgICAgICAic2V0IGNoYW5uZWwgbGF5b3V0IiwgICAg ICAgICAgICAgICAgICAgICAgICAgT0ZGU0VUKGNobGF5b3V0KSwgICAgQVZfT1BUX1RZUEVfQ0hM QVlPVVQsey5zdHI9InN0ZXJlbyJ9LDAsICAgICAgMCwgICBBRiB9LAogICAgIHsgTlVMTCB9CiB9 OwogCkBAIC0xNjUsOSArMTQ1LDcgQEAgY29uc3QgQVZGaWx0ZXIgZmZfYXNyY19hZmRlbGF5c3Jj ID0gewogICAgIC5kZXNjcmlwdGlvbiAgID0gTlVMTF9JRl9DT05GSUdfU01BTEwoIkdlbmVyYXRl IGEgRnJhY3Rpb25hbCBkZWxheSBGSVIgY29lZmZpY2llbnRzLiIpLAogICAgIC5wcml2X3NpemUg ICAgID0gc2l6ZW9mKEFGRGVsYXlTcmNDb250ZXh0KSwKICAgICAucHJpdl9jbGFzcyAgICA9ICZh ZmRlbGF5c3JjX2NsYXNzLAotICAgIC5pbml0ICAgICAgICAgID0gaW5pdCwKICAgICAuYWN0aXZh dGUgICAgICA9IGFjdGl2YXRlLAotICAgIC51bmluaXQgICAgICAgID0gdW5pbml0LAogICAgIC5p bnB1dHMgICAgICAgID0gTlVMTCwKICAgICBGSUxURVJfT1VUUFVUUyhhZmRlbGF5c3JjX291dHB1 dHMpLAogICAgIEZJTFRFUl9RVUVSWV9GVU5DKHF1ZXJ5X2Zvcm1hdHMpLApkaWZmIC0tZ2l0IGEv bGliYXZmaWx0ZXIvYXNyY19hbnVsbHNyYy5jIGIvbGliYXZmaWx0ZXIvYXNyY19hbnVsbHNyYy5j CmluZGV4IGM4OTEwMGMwZGMuLmE4ODg3ZGE2MmQgMTAwNjQ0Ci0tLSBhL2xpYmF2ZmlsdGVyL2Fz cmNfYW51bGxzcmMuYworKysgYi9saWJhdmZpbHRlci9hc3JjX2FudWxsc3JjLmMKQEAgLTM4LDkg KzM4LDcgQEAKIAogdHlwZWRlZiBzdHJ1Y3QgQU51bGxDb250ZXh0IHsKICAgICBjb25zdCBBVkNs YXNzICpjbGFzczsKLSAgICBjaGFyICAgKmNoYW5uZWxfbGF5b3V0X3N0cjsKICAgICBBVkNoYW5u ZWxMYXlvdXQgY2hfbGF5b3V0OwotICAgIGNoYXIgICAqc2FtcGxlX3JhdGVfc3RyOwogICAgIGlu dCAgICAgc2FtcGxlX3JhdGU7CiAgICAgaW50NjRfdCBkdXJhdGlvbjsKICAgICBpbnQgbmJfc2Ft cGxlczsgICAgICAgICAgICAgLy8vPCBudW1iZXIgb2Ygc2FtcGxlcyBwZXIgcmVxdWVzdGVkIGZy YW1lCkBAIC01MSwxMCArNDksMTAgQEAgdHlwZWRlZiBzdHJ1Y3QgQU51bGxDb250ZXh0IHsKICNk ZWZpbmUgRkxBR1MgQVZfT1BUX0ZMQUdfQVVESU9fUEFSQU18QVZfT1BUX0ZMQUdfRklMVEVSSU5H X1BBUkFNCiAKIHN0YXRpYyBjb25zdCBBVk9wdGlvbiBhbnVsbHNyY19vcHRpb25zW109IHsKLSAg ICB7ICJjaGFubmVsX2xheW91dCIsICJzZXQgY2hhbm5lbF9sYXlvdXQiLCBPRkZTRVQoY2hhbm5l bF9sYXlvdXRfc3RyKSwgQVZfT1BUX1RZUEVfU1RSSU5HLCB7LnN0ciA9ICJzdGVyZW8ifSwgMCwg MCwgRkxBR1MgfSwKLSAgICB7ICJjbCIsICAgICAgICAgICAgICJzZXQgY2hhbm5lbF9sYXlvdXQi LCBPRkZTRVQoY2hhbm5lbF9sYXlvdXRfc3RyKSwgQVZfT1BUX1RZUEVfU1RSSU5HLCB7LnN0ciA9 ICJzdGVyZW8ifSwgMCwgMCwgRkxBR1MgfSwKLSAgICB7ICJzYW1wbGVfcmF0ZSIsICAgICJzZXQg c2FtcGxlIHJhdGUiLCAgICBPRkZTRVQoc2FtcGxlX3JhdGVfc3RyKSAgICwgQVZfT1BUX1RZUEVf U1RSSU5HLCB7LnN0ciA9ICI0NDEwMCJ9LCAwLCAwLCBGTEFHUyB9LAotICAgIHsgInIiLCAgICAg ICAgICAgICAgInNldCBzYW1wbGUgcmF0ZSIsICAgIE9GRlNFVChzYW1wbGVfcmF0ZV9zdHIpICAg LCBBVl9PUFRfVFlQRV9TVFJJTkcsIHsuc3RyID0gIjQ0MTAwIn0sIDAsIDAsIEZMQUdTIH0sCisg ICAgeyAiY2hhbm5lbF9sYXlvdXQiLCAic2V0IGNoYW5uZWxfbGF5b3V0IiwgT0ZGU0VUKGNoX2xh eW91dCksIEFWX09QVF9UWVBFX0NITEFZT1VULCB7LnN0ciA9ICJzdGVyZW8ifSwgMCwgMCwgRkxB R1MgfSwKKyAgICB7ICJjbCIsICAgICAgICAgICAgICJzZXQgY2hhbm5lbF9sYXlvdXQiLCBPRkZT RVQoY2hfbGF5b3V0KSwgQVZfT1BUX1RZUEVfQ0hMQVlPVVQsIHsuc3RyID0gInN0ZXJlbyJ9LCAw LCAwLCBGTEFHUyB9LAorICAgIHsgInNhbXBsZV9yYXRlIiwgICAgInNldCBzYW1wbGUgcmF0ZSIs ICAgIE9GRlNFVChzYW1wbGVfcmF0ZSkgICAsIEFWX09QVF9UWVBFX0lOVCwgey5pNjQgPSA0NDEw MH0sIDAsIDAsIEZMQUdTIH0sCisgICAgeyAiciIsICAgICAgICAgICAgICAic2V0IHNhbXBsZSBy YXRlIiwgICAgT0ZGU0VUKHNhbXBsZV9yYXRlKSAgICwgQVZfT1BUX1RZUEVfSU5ULCB7Lmk2NCA9 IDQ0MTAwfSwgMCwgMCwgRkxBR1MgfSwKICAgICB7ICJuYl9zYW1wbGVzIiwgICAgICJzZXQgdGhl IG51bWJlciBvZiBzYW1wbGVzIHBlciByZXF1ZXN0ZWQgZnJhbWUiLCBPRkZTRVQobmJfc2FtcGxl cyksIEFWX09QVF9UWVBFX0lOVCwgey5pNjQgPSAxMDI0fSwgMSwgVUlOVDE2X01BWCwgRkxBR1Mg fSwKICAgICB7ICJuIiwgICAgICAgICAgICAgICJzZXQgdGhlIG51bWJlciBvZiBzYW1wbGVzIHBl ciByZXF1ZXN0ZWQgZnJhbWUiLCBPRkZTRVQobmJfc2FtcGxlcyksIEFWX09QVF9UWVBFX0lOVCwg ey5pNjQgPSAxMDI0fSwgMSwgVUlOVDE2X01BWCwgRkxBR1MgfSwKICAgICB7ICJkdXJhdGlvbiIs ICAgICAgICJzZXQgdGhlIGF1ZGlvIGR1cmF0aW9uIiwgICAgICAgICAgICAgICAgICAgICAgICBP RkZTRVQoZHVyYXRpb24pLCAgIEFWX09QVF9UWVBFX0RVUkFUSU9OLCB7Lmk2NCA9IC0xfSwgLTEs IElOVDY0X01BWCwgRkxBR1MgfSwKQEAgLTY0LDIyICs2Miw2IEBAIHN0YXRpYyBjb25zdCBBVk9w dGlvbiBhbnVsbHNyY19vcHRpb25zW109IHsKIAogQVZGSUxURVJfREVGSU5FX0NMQVNTKGFudWxs c3JjKTsKIAotc3RhdGljIGF2X2NvbGQgaW50IGluaXQoQVZGaWx0ZXJDb250ZXh0ICpjdHgpCi17 Ci0gICAgQU51bGxDb250ZXh0ICpudWxsID0gY3R4LT5wcml2OwotICAgIGludCByZXQ7Ci0KLSAg ICBpZiAoKHJldCA9IGZmX3BhcnNlX3NhbXBsZV9yYXRlKCZudWxsLT5zYW1wbGVfcmF0ZSwKLSAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBudWxsLT5zYW1wbGVfcmF0ZV9zdHIs IGN0eCkpIDwgMCkKLSAgICAgICAgcmV0dXJuIHJldDsKLQotICAgIGlmICgocmV0ID0gZmZfcGFy c2VfY2hhbm5lbF9sYXlvdXQoJm51bGwtPmNoX2xheW91dCwgTlVMTCwKLSAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICBudWxsLT5jaGFubmVsX2xheW91dF9zdHIsIGN0eCkp IDwgMCkKLSAgICAgICAgcmV0dXJuIHJldDsKLQotICAgIHJldHVybiAwOwotfQotCiBzdGF0aWMg aW50IHF1ZXJ5X2Zvcm1hdHMoQVZGaWx0ZXJDb250ZXh0ICpjdHgpCiB7CiAgICAgQU51bGxDb250 ZXh0ICpudWxsID0gY3R4LT5wcml2OwpAQCAtMTI5LDEyICsxMTEsNiBAQCBzdGF0aWMgaW50IGFj dGl2YXRlKEFWRmlsdGVyQ29udGV4dCAqY3R4KQogICAgIHJldHVybiBGRkVSUk9SX05PVF9SRUFE WTsKIH0KIAotc3RhdGljIGF2X2NvbGQgdm9pZCB1bmluaXQoQVZGaWx0ZXJDb250ZXh0ICpjdHgp Ci17Ci0gICAgQU51bGxDb250ZXh0ICpzID0gY3R4LT5wcml2OwotICAgIGF2X2NoYW5uZWxfbGF5 b3V0X3VuaW5pdCgmcy0+Y2hfbGF5b3V0KTsKLX0KLQogc3RhdGljIGNvbnN0IEFWRmlsdGVyUGFk IGF2ZmlsdGVyX2FzcmNfYW51bGxzcmNfb3V0cHV0c1tdID0gewogICAgIHsKICAgICAgICAgLm5h bWUgICAgICAgICAgPSAiZGVmYXVsdCIsCkBAIC0xNDYsOCArMTIyLDYgQEAgc3RhdGljIGNvbnN0 IEFWRmlsdGVyUGFkIGF2ZmlsdGVyX2FzcmNfYW51bGxzcmNfb3V0cHV0c1tdID0gewogY29uc3Qg QVZGaWx0ZXIgZmZfYXNyY19hbnVsbHNyYyA9IHsKICAgICAubmFtZSAgICAgICAgICA9ICJhbnVs bHNyYyIsCiAgICAgLmRlc2NyaXB0aW9uICAgPSBOVUxMX0lGX0NPTkZJR19TTUFMTCgiTnVsbCBh dWRpbyBzb3VyY2UsIHJldHVybiBlbXB0eSBhdWRpbyBmcmFtZXMuIiksCi0gICAgLmluaXQgICAg ICAgICAgPSBpbml0LAotICAgIC51bmluaXQgICAgICAgID0gdW5pbml0LAogICAgIC5wcml2X3Np emUgICAgID0gc2l6ZW9mKEFOdWxsQ29udGV4dCksCiAgICAgLmlucHV0cyAgICAgICAgPSBOVUxM LAogICAgIEZJTFRFUl9PVVRQVVRTKGF2ZmlsdGVyX2FzcmNfYW51bGxzcmNfb3V0cHV0cyksCi0t IAoyLjQyLjEKCg== --000000000000244cfb060a86716c 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". --000000000000244cfb060a86716c--