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 09EB846D77 for ; Wed, 9 Aug 2023 21:29:14 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4BD6868C897; Thu, 10 Aug 2023 00:29:12 +0300 (EEST) Received: from mail-vk1-f178.google.com (mail-vk1-f178.google.com [209.85.221.178]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2351568C807 for ; Thu, 10 Aug 2023 00:29:06 +0300 (EEST) Received: by mail-vk1-f178.google.com with SMTP id 71dfb90a1353d-48711283853so130102e0c.0 for ; Wed, 09 Aug 2023 14:29:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1691616544; x=1692221344; h=to:subject:message-id:date:from:mime-version:from:to:cc:subject :date:message-id:reply-to; bh=QddAQLSr+ppXAsbABNKwQu59kCd4lvJ81ZvsQ2Kmtx0=; b=DZ55v8FWrIwqRpJEXrZHDxYjtQmJju/kw0f7M26SQxSzy/3moRbKFMWoqT1Pk0rULx QT19pbZAwFC8fcsKY9h/SuFxJYyg6qZikta0eAAo1eG3fzXO+GSlDGJ8SXWF4OtvT3B+ 8aG20OGv4pJGR5kevAMrgMZ2c/b/czA/SHZabr4Lcamp6UWx22hrG+WZO6OyNy9/g/W/ Yz6V/9AaciHKB6DyHrgzTw+9KNAX/QXkeMvUl82PoGzsrPQyIqTKXC4aifaOT63eIRBC ekstrkFPYYnQvr4aUAoZURRkUNUiyeCjL2vwWM0qhVmrIyCGcFzqNlqVuqN6W6PWEbwb fpVw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1691616544; x=1692221344; h=to:subject:message-id:date:from:mime-version:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=QddAQLSr+ppXAsbABNKwQu59kCd4lvJ81ZvsQ2Kmtx0=; b=Es4J0a1HD9fRVX9RrlbA9xj1wLpQZmGufRcFPCwPaF8CVjHH1XkQkivHE1T8WDeW4w c9r5mvPe6dT0xYNIy8qeoFoE5cd45CD8R19n66ls8wWSgkRSOLOg5dKcKyyfJ/FV3n/K mBIq6ltN5DcWVME6j+KmZt/VTlU34AIOt38N7xRWm9ZAhq6QNL9vuPT/g9lr35CXTzxg 5kL3i9uWmfDmz6TdRAO9pkg376pQsS4lW6Mt9WmRc5ZXAY/l3O+XVoQkZw3R96T5T3yF T99EvMPw/pszNdkAJLYH0C5ywy61G+rK4Gh1F5SLobA5BGKQfR/B0gJ8xqKaY9Nm23OZ iSaA== X-Gm-Message-State: AOJu0YyYcAHRuqm5oCh4LpS2LJjvryv4HHozfVf4egpmcjHvgspTD1AV Vt9+ETBgHAEC2A4RlhvZpeOzWWfwyol0ZkS5V0M3JhZYrUg= X-Google-Smtp-Source: AGHT+IEZAKJLIheRcf1fnZmfK28Qipom+iMp1WLBA2kdP3F3kmegbarXRDsO4il1aRvere810KQJDjk6AHRSnGUMRl0= X-Received: by 2002:a1f:eb42:0:b0:487:179c:25e1 with SMTP id j63-20020a1feb42000000b00487179c25e1mr714157vkh.4.1691616544585; Wed, 09 Aug 2023 14:29:04 -0700 (PDT) MIME-Version: 1.0 From: Paul B Mahol Date: Wed, 9 Aug 2023 23:36:16 +0200 Message-ID: To: FFmpeg development discussions and patches Content-Type: multipart/mixed; boundary="0000000000003ce0060602842b8c" X-Content-Filtered-By: Mailman/MimeDel 2.1.29 Subject: [FFmpeg-devel] [PATCH] new audio filter and misc improvements 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: --0000000000003ce0060602842b8c Content-Type: text/plain; charset="UTF-8" Patches attached. --0000000000003ce0060602842b8c Content-Type: text/x-patch; charset="US-ASCII"; name="0003-avfilter-af_adeclick-do-not-output-pointless-message.patch" Content-Disposition: attachment; filename="0003-avfilter-af_adeclick-do-not-output-pointless-message.patch" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_ll4928aq0 RnJvbSAyZDhjMzMwZjU0MzM5NzY0MmZhMWFmZTBhMDFhNjcxNTUwMDhkNGUxIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBQYXVsIEIgTWFob2wgPG9uZW1kYUBnbWFpbC5jb20+CkRhdGU6 IFdlZCwgOSBBdWcgMjAyMyAyMTo1MzowNCArMDIwMApTdWJqZWN0OiBbUEFUQ0ggMy8zXSBhdmZp bHRlci9hZl9hZGVjbGljazogZG8gbm90IG91dHB1dCBwb2ludGxlc3MgbWVzc2FnZQoKU2lnbmVk LW9mZi1ieTogUGF1bCBCIE1haG9sIDxvbmVtZGFAZ21haWwuY29tPgotLS0KIGxpYmF2ZmlsdGVy L2FmX2FkZWNsaWNrLmMgfCA3ICsrKystLS0KIDEgZmlsZSBjaGFuZ2VkLCA0IGluc2VydGlvbnMo KyksIDMgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvbGliYXZmaWx0ZXIvYWZfYWRlY2xpY2su YyBiL2xpYmF2ZmlsdGVyL2FmX2FkZWNsaWNrLmMKaW5kZXggZmQwNDM4ZDI1Mi4uMzQwMTAyOGM2 YiAxMDA2NDQKLS0tIGEvbGliYXZmaWx0ZXIvYWZfYWRlY2xpY2suYworKysgYi9saWJhdmZpbHRl ci9hZl9hZGVjbGljay5jCkBAIC03MjEsOSArNzIxLDEwIEBAIHN0YXRpYyBhdl9jb2xkIHZvaWQg dW5pbml0KEFWRmlsdGVyQ29udGV4dCAqY3R4KQogewogICAgIEF1ZGlvRGVjbGlja0NvbnRleHQg KnMgPSBjdHgtPnByaXY7CiAKLSAgICBhdl9sb2coY3R4LCBBVl9MT0dfSU5GTywgIkRldGVjdGVk ICVzIGluICUiUFJJZDY0IiBvZiAlIlBSSWQ2NCIgc2FtcGxlcyAoJWclJSkuXG4iLAotICAgICAg ICAgICBmaWx0ZXJfbW9kZXNbcy0+bW9kZV0sIHMtPmRldGVjdGVkX2Vycm9ycywKLSAgICAgICAg ICAgcy0+bmJfc2FtcGxlcywgMTAwLiAqIHMtPmRldGVjdGVkX2Vycm9ycyAvIHMtPm5iX3NhbXBs ZXMpOworICAgIGlmIChzLT5uYl9zYW1wbGVzID4gMCkKKyAgICAgICAgYXZfbG9nKGN0eCwgQVZf TE9HX0lORk8sICJEZXRlY3RlZCAlcyBpbiAlIlBSSWQ2NCIgb2YgJSJQUklkNjQiIHNhbXBsZXMg KCVnJSUpLlxuIiwKKyAgICAgICAgICAgICAgIGZpbHRlcl9tb2Rlc1tzLT5tb2RlXSwgcy0+ZGV0 ZWN0ZWRfZXJyb3JzLAorICAgICAgICAgICAgICAgcy0+bmJfc2FtcGxlcywgMTAwLiAqIHMtPmRl dGVjdGVkX2Vycm9ycyAvIHMtPm5iX3NhbXBsZXMpOwogCiAgICAgYXZfYXVkaW9fZmlmb19mcmVl KHMtPmZpZm8pOwogICAgIGF2X2F1ZGlvX2ZpZm9fZnJlZShzLT5lZmlmbyk7Ci0tIAoyLjM5LjEK Cg== --0000000000003ce0060602842b8c Content-Type: text/x-patch; charset="US-ASCII"; name="0002-avfilter-af_adeclick-refactor-and-cleanup.patch" Content-Disposition: attachment; filename="0002-avfilter-af_adeclick-refactor-and-cleanup.patch" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_ll4928fr1 RnJvbSAwYTZkZTliMTQ4MmVjZTQ0MDJiMWM3Mjc0NTAxYjQzZTQzZjVmNTZhIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBQYXVsIEIgTWFob2wgPG9uZW1kYUBnbWFpbC5jb20+CkRhdGU6 IFdlZCwgOSBBdWcgMjAyMyAyMTo0OToxOSArMDIwMApTdWJqZWN0OiBbUEFUQ0ggMi8zXSBhdmZp bHRlci9hZl9hZGVjbGljazogcmVmYWN0b3IgYW5kIGNsZWFudXAKClNpZ25lZC1vZmYtYnk6IFBh dWwgQiBNYWhvbCA8b25lbWRhQGdtYWlsLmNvbT4KLS0tCiBsaWJhdmZpbHRlci9hZl9hZGVjbGlj ay5jIHwgMTM2ICsrKysrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0tLS0tCiAxIGZpbGUg Y2hhbmdlZCwgNjcgaW5zZXJ0aW9ucygrKSwgNjkgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEv bGliYXZmaWx0ZXIvYWZfYWRlY2xpY2suYyBiL2xpYmF2ZmlsdGVyL2FmX2FkZWNsaWNrLmMKaW5k ZXggMTEzN2RiZTI1Yi4uZmQwNDM4ZDI1MiAxMDA2NDQKLS0tIGEvbGliYXZmaWx0ZXIvYWZfYWRl Y2xpY2suYworKysgYi9saWJhdmZpbHRlci9hZl9hZGVjbGljay5jCkBAIC0xMTksNyArMTE5LDYg QEAgc3RhdGljIGludCBjb25maWdfaW5wdXQoQVZGaWx0ZXJMaW5rICppbmxpbmspCiB7CiAgICAg QVZGaWx0ZXJDb250ZXh0ICpjdHggPSBpbmxpbmstPmRzdDsKICAgICBBdWRpb0RlY2xpY2tDb250 ZXh0ICpzID0gY3R4LT5wcml2OwotICAgIGludCBpOwogCiAgICAgcy0+cHRzID0gQVZfTk9QVFNf VkFMVUU7CiAgICAgcy0+d2luZG93X3NpemUgPSBpbmxpbmstPnNhbXBsZV9yYXRlICogcy0+dyAv IDEwMDAuOwpAQCAtMTM0LDcgKzEzMyw3IEBAIHN0YXRpYyBpbnQgY29uZmlnX2lucHV0KEFWRmls dGVyTGluayAqaW5saW5rKQogICAgIHMtPndpbmRvd19mdW5jX2x1dCA9IGF2X2NhbGxvYyhzLT53 aW5kb3dfc2l6ZSwgc2l6ZW9mKCpzLT53aW5kb3dfZnVuY19sdXQpKTsKICAgICBpZiAoIXMtPndp bmRvd19mdW5jX2x1dCkKICAgICAgICAgcmV0dXJuIEFWRVJST1IoRU5PTUVNKTsKLSAgICBmb3Ig KGkgPSAwOyBpIDwgcy0+d2luZG93X3NpemU7IGkrKykKKyAgICBmb3IgKGludCBpID0gMDsgaSA8 IHMtPndpbmRvd19zaXplOyBpKyspCiAgICAgICAgIHMtPndpbmRvd19mdW5jX2x1dFtpXSA9IHNp bihNX1BJICogaSAvIHMtPndpbmRvd19zaXplKSAqCiAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICgxLiAtIChzLT5vdmVybGFwIC8gMTAwLikpICogTV9QSV8yOwogCkBAIC0xNjcsNyAr MTY2LDcgQEAgc3RhdGljIGludCBjb25maWdfaW5wdXQoQVZGaWx0ZXJMaW5rICppbmxpbmspCiAg ICAgaWYgKCFzLT5jaGFuKQogICAgICAgICByZXR1cm4gQVZFUlJPUihFTk9NRU0pOwogCi0gICAg Zm9yIChpID0gMDsgaSA8IGlubGluay0+Y2hfbGF5b3V0Lm5iX2NoYW5uZWxzOyBpKyspIHsKKyAg ICBmb3IgKGludCBpID0gMDsgaSA8IGlubGluay0+Y2hfbGF5b3V0Lm5iX2NoYW5uZWxzOyBpKysp IHsKICAgICAgICAgRGVjbGlja0NoYW5uZWwgKmMgPSAmcy0+Y2hhbltpXTsKIAogICAgICAgICBj LT5kZXRlY3Rpb24gPSBhdl9jYWxsb2Mocy0+d2luZG93X3NpemUsIHNpemVvZigqYy0+ZGV0ZWN0 aW9uKSk7CkBAIC0xODksMTMgKzE4OCwxMyBAQCBzdGF0aWMgaW50IGNvbmZpZ19pbnB1dChBVkZp bHRlckxpbmsgKmlubGluaykKIHN0YXRpYyB2b2lkIGF1dG9jb3JyZWxhdGlvbihjb25zdCBkb3Vi bGUgKmlucHV0LCBpbnQgb3JkZXIsIGludCBzaXplLAogICAgICAgICAgICAgICAgICAgICAgICAg ICAgIGRvdWJsZSAqb3V0cHV0LCBkb3VibGUgc2NhbGUpCiB7Ci0gICAgaW50IGksIGo7Ci0KLSAg ICBmb3IgKGkgPSAwOyBpIDw9IG9yZGVyOyBpKyspIHsKKyAgICBmb3IgKGludCBpID0gMDsgaSA8 PSBvcmRlcjsgaSsrKSB7CisgICAgICAgIGNvbnN0IGRvdWJsZSAqbmlucHV0ID0gaW5wdXQgKyBp OworICAgICAgICBjb25zdCBpbnQgaXNpemUgPSBzaXplIC0gaTsKICAgICAgICAgZG91YmxlIHZh bHVlID0gMC47CiAKLSAgICAgICAgZm9yIChqID0gaTsgaiA8IHNpemU7IGorKykKLSAgICAgICAg ICAgIHZhbHVlICs9IGlucHV0W2pdICogaW5wdXRbaiAtIGldOworICAgICAgICBmb3IgKGludCBq ID0gMDsgaiA8IGlzaXplOyBqKyspCisgICAgICAgICAgICB2YWx1ZSArPSBuaW5wdXRbal0gKiBp bnB1dFtqXTsKIAogICAgICAgICBvdXRwdXRbaV0gPSB2YWx1ZSAqIHNjYWxlOwogICAgIH0KQEAg LTIwNSw3ICsyMDQsNiBAQCBzdGF0aWMgZG91YmxlIGF1dG9yZWdyZXNzaW9uKGNvbnN0IGRvdWJs ZSAqc2FtcGxlcywgaW50IGFyX29yZGVyLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICBp bnQgbmJfc2FtcGxlcywgZG91YmxlICprLCBkb3VibGUgKnIsIGRvdWJsZSAqYSkKIHsKICAgICBk b3VibGUgYWxwaGE7Ci0gICAgaW50IGksIGo7CiAKICAgICBtZW1zZXQoYSwgMCwgYXJfb3JkZXIg KiBzaXplb2YoKmEpKTsKIApAQCAtMjE0LDIzICsyMTIsMjMgQEAgc3RhdGljIGRvdWJsZSBhdXRv cmVncmVzc2lvbihjb25zdCBkb3VibGUgKnNhbXBsZXMsIGludCBhcl9vcmRlciwKICAgICAvKiBM ZXZpbnNvbi1EdXJiaW4gYWxnb3JpdGhtICovCiAgICAga1swXSA9IGFbMF0gPSAtclsxXSAvIHJb MF07CiAgICAgYWxwaGEgPSByWzBdICogKDEuIC0ga1swXSAqIGtbMF0pOwotICAgIGZvciAoaSA9 IDE7IGkgPCBhcl9vcmRlcjsgaSsrKSB7CisgICAgZm9yIChpbnQgaSA9IDE7IGkgPCBhcl9vcmRl cjsgaSsrKSB7CiAgICAgICAgIGRvdWJsZSBlcHNpbG9uID0gMC47CiAKLSAgICAgICAgZm9yIChq ID0gMDsgaiA8IGk7IGorKykKKyAgICAgICAgZm9yIChpbnQgaiA9IDA7IGogPCBpOyBqKyspCiAg ICAgICAgICAgICBlcHNpbG9uICs9IGFbal0gKiByW2kgLSBqXTsKICAgICAgICAgZXBzaWxvbiAr PSByW2kgKyAxXTsKIAogICAgICAgICBrW2ldID0gLWVwc2lsb24gLyBhbHBoYTsKICAgICAgICAg YWxwaGEgKj0gKDEuIC0ga1tpXSAqIGtbaV0pOwotICAgICAgICBmb3IgKGogPSBpIC0gMTsgaiA+ PSAwOyBqLS0pCisgICAgICAgIGZvciAoaW50IGogPSBpIC0gMTsgaiA+PSAwOyBqLS0pCiAgICAg ICAgICAgICBrW2pdID0gYVtqXSArIGtbaV0gKiBhW2kgLSBqIC0gMV07Ci0gICAgICAgIGZvciAo aiA9IDA7IGogPD0gaTsgaisrKQorICAgICAgICBmb3IgKGludCBqID0gMDsgaiA8PSBpOyBqKysp CiAgICAgICAgICAgICBhW2pdID0ga1tqXTsKICAgICB9CiAKICAgICBrWzBdID0gMS47Ci0gICAg Zm9yIChpID0gMTsgaSA8PSBhcl9vcmRlcjsgaSsrKQorICAgIGZvciAoaW50IGkgPSAxOyBpIDw9 IGFyX29yZGVyOyBpKyspCiAgICAgICAgIGtbaV0gPSBhW2kgLSAxXTsKIAogICAgIHJldHVybiBz cXJ0KGFscGhhKTsKQEAgLTIzOCw5ICsyMzYsNyBAQCBzdGF0aWMgZG91YmxlIGF1dG9yZWdyZXNz aW9uKGNvbnN0IGRvdWJsZSAqc2FtcGxlcywgaW50IGFyX29yZGVyLAogCiBzdGF0aWMgaW50IGlz ZmluaXRlX2FycmF5KGRvdWJsZSAqc2FtcGxlcywgaW50IG5iX3NhbXBsZXMpCiB7Ci0gICAgaW50 IGk7Ci0KLSAgICBmb3IgKGkgPSAwOyBpIDwgbmJfc2FtcGxlczsgaSsrKQorICAgIGZvciAoaW50 IGkgPSAwOyBpIDwgbmJfc2FtcGxlczsgaSsrKQogICAgICAgICBpZiAoIWlzZmluaXRlKHNhbXBs ZXNbaV0pKQogICAgICAgICAgICAgcmV0dXJuIDA7CiAKQEAgLTI3MiwxNCArMjY4LDEyIEBAIHN0 YXRpYyBpbnQgZmluZF9pbmRleChpbnQgKmluZGV4LCBpbnQgdmFsdWUsIGludCBzaXplKQogCiBz dGF0aWMgaW50IGZhY3Rvcml6YXRpb24oZG91YmxlICptYXRyaXgsIGludCBuKQogewotICAgIGlu dCBpLCBqLCBrOwotCi0gICAgZm9yIChpID0gMDsgaSA8IG47IGkrKykgeworICAgIGZvciAoaW50 IGkgPSAwOyBpIDwgbjsgaSsrKSB7CiAgICAgICAgIGNvbnN0IGludCBpbiA9IGkgKiBuOwogICAg ICAgICBkb3VibGUgdmFsdWU7CiAKICAgICAgICAgdmFsdWUgPSBtYXRyaXhbaW4gKyBpXTsKLSAg ICAgICAgZm9yIChqID0gMDsgaiA8IGk7IGorKykKKyAgICAgICAgZm9yIChpbnQgaiA9IDA7IGog PCBpOyBqKyspCiAgICAgICAgICAgICB2YWx1ZSAtPSBtYXRyaXhbaiAqIG4gKyBqXSAqIG1hdHJp eFtpbiArIGpdICogbWF0cml4W2luICsgal07CiAKICAgICAgICAgaWYgKHZhbHVlID09IDAuKSB7 CkBAIC0yODcsMTIgKzI4MSwxMiBAQCBzdGF0aWMgaW50IGZhY3Rvcml6YXRpb24oZG91YmxlICpt YXRyaXgsIGludCBuKQogICAgICAgICB9CiAKICAgICAgICAgbWF0cml4W2luICsgaV0gPSB2YWx1 ZTsKLSAgICAgICAgZm9yIChqID0gaSArIDE7IGogPCBuOyBqKyspIHsKKyAgICAgICAgZm9yIChp bnQgaiA9IGkgKyAxOyBqIDwgbjsgaisrKSB7CiAgICAgICAgICAgICBjb25zdCBpbnQgam4gPSBq ICogbjsKICAgICAgICAgICAgIGRvdWJsZSB4OwogCiAgICAgICAgICAgICB4ID0gbWF0cml4W2pu ICsgaV07Ci0gICAgICAgICAgICBmb3IgKGsgPSAwOyBrIDwgaTsgaysrKQorICAgICAgICAgICAg Zm9yIChpbnQgayA9IDA7IGsgPCBpOyBrKyspCiAgICAgICAgICAgICAgICAgeCAtPSBtYXRyaXhb ayAqIG4gKyBrXSAqIG1hdHJpeFtpbiArIGtdICogbWF0cml4W2puICsga107CiAgICAgICAgICAg ICBtYXRyaXhbam4gKyBpXSA9IHggLyBtYXRyaXhbaW4gKyBpXTsKICAgICAgICAgfQpAQCAtMzA0 LDggKzI5OCw4IEBAIHN0YXRpYyBpbnQgZmFjdG9yaXphdGlvbihkb3VibGUgKm1hdHJpeCwgaW50 IG4pCiBzdGF0aWMgaW50IGRvX2ludGVycG9sYXRpb24oRGVjbGlja0NoYW5uZWwgKmMsIGRvdWJs ZSAqbWF0cml4LAogICAgICAgICAgICAgICAgICAgICAgICAgICAgIGRvdWJsZSAqdmVjdG9yLCBp bnQgbiwgZG91YmxlICpvdXQpCiB7Ci0gICAgaW50IGksIGosIHJldDsKICAgICBkb3VibGUgKnk7 CisgICAgaW50IHJldDsKIAogICAgIHJldCA9IGZhY3Rvcml6YXRpb24obWF0cml4LCBuKTsKICAg ICBpZiAocmV0IDwgMCkKQEAgLTMxNiwxOSArMzEwLDE5IEBAIHN0YXRpYyBpbnQgZG9faW50ZXJw b2xhdGlvbihEZWNsaWNrQ2hhbm5lbCAqYywgZG91YmxlICptYXRyaXgsCiAgICAgaWYgKCF5KQog ICAgICAgICByZXR1cm4gQVZFUlJPUihFTk9NRU0pOwogCi0gICAgZm9yIChpID0gMDsgaSA8IG47 IGkrKykgeworICAgIGZvciAoaW50IGkgPSAwOyBpIDwgbjsgaSsrKSB7CiAgICAgICAgIGNvbnN0 IGludCBpbiA9IGkgKiBuOwogICAgICAgICBkb3VibGUgdmFsdWU7CiAKICAgICAgICAgdmFsdWUg PSB2ZWN0b3JbaV07Ci0gICAgICAgIGZvciAoaiA9IDA7IGogPCBpOyBqKyspCisgICAgICAgIGZv ciAoaW50IGogPSAwOyBqIDwgaTsgaisrKQogICAgICAgICAgICAgdmFsdWUgLT0gbWF0cml4W2lu ICsgal0gKiB5W2pdOwogICAgICAgICB5W2ldID0gdmFsdWU7CiAgICAgfQogCi0gICAgZm9yIChp ID0gbiAtIDE7IGkgPj0gMDsgaS0tKSB7CisgICAgZm9yIChpbnQgaSA9IG4gLSAxOyBpID49IDA7 IGktLSkgewogICAgICAgICBvdXRbaV0gPSB5W2ldIC8gbWF0cml4W2kgKiBuICsgaV07Ci0gICAg ICAgIGZvciAoaiA9IGkgKyAxOyBqIDwgbjsgaisrKQorICAgICAgICBmb3IgKGludCBqID0gaSAr IDE7IGogPCBuOyBqKyspCiAgICAgICAgICAgICBvdXRbaV0gLT0gbWF0cml4W2ogKiBuICsgaV0g KiBvdXRbal07CiAgICAgfQogCkBAIC0zNDAsNyArMzM0LDYgQEAgc3RhdGljIGludCBpbnRlcnBv bGF0aW9uKERlY2xpY2tDaGFubmVsICpjLCBjb25zdCBkb3VibGUgKnNyYywgaW50IGFyX29yZGVy LAogICAgICAgICAgICAgICAgICAgICAgICAgIGRvdWJsZSAqYXV4aWxpYXJ5LCBkb3VibGUgKmlu dGVycG9sYXRlZCkKIHsKICAgICBkb3VibGUgKnZlY3RvciwgKm1hdHJpeDsKLSAgICBpbnQgaSwg ajsKIAogICAgIGF2X2Zhc3RfbWFsbG9jKCZjLT5tYXRyaXgsICZjLT5tYXRyaXhfc2l6ZSwgbmJf ZXJyb3JzICogbmJfZXJyb3JzICogc2l6ZW9mKCpjLT5tYXRyaXgpKTsKICAgICBtYXRyaXggPSBj LT5tYXRyaXg7CkBAIC0zNTQsMTAgKzM0NywxMCBAQCBzdGF0aWMgaW50IGludGVycG9sYXRpb24o RGVjbGlja0NoYW5uZWwgKmMsIGNvbnN0IGRvdWJsZSAqc3JjLCBpbnQgYXJfb3JkZXIsCiAKICAg ICBhdXRvY29ycmVsYXRpb24oYWNvZWZmaWNpZW50cywgYXJfb3JkZXIsIGFyX29yZGVyICsgMSwg YXV4aWxpYXJ5LCAxLik7CiAKLSAgICBmb3IgKGkgPSAwOyBpIDwgbmJfZXJyb3JzOyBpKyspIHsK KyAgICBmb3IgKGludCBpID0gMDsgaSA8IG5iX2Vycm9yczsgaSsrKSB7CiAgICAgICAgIGNvbnN0 IGludCBpbSA9IGkgKiBuYl9lcnJvcnM7CiAKLSAgICAgICAgZm9yIChqID0gaTsgaiA8IG5iX2Vy cm9yczsgaisrKSB7CisgICAgICAgIGZvciAoaW50IGogPSBpOyBqIDwgbmJfZXJyb3JzOyBqKysp IHsKICAgICAgICAgICAgIGlmIChhYnMoaW5kZXhbal0gLSBpbmRleFtpXSkgPD0gYXJfb3JkZXIp IHsKICAgICAgICAgICAgICAgICBtYXRyaXhbaiAqIG5iX2Vycm9ycyArIGldID0gbWF0cml4W2lt ICsgal0gPSBhdXhpbGlhcnlbYWJzKGluZGV4W2pdIC0gaW5kZXhbaV0pXTsKICAgICAgICAgICAg IH0gZWxzZSB7CkBAIC0zNjYsMTAgKzM1OSwxMCBAQCBzdGF0aWMgaW50IGludGVycG9sYXRpb24o RGVjbGlja0NoYW5uZWwgKmMsIGNvbnN0IGRvdWJsZSAqc3JjLCBpbnQgYXJfb3JkZXIsCiAgICAg ICAgIH0KICAgICB9CiAKLSAgICBmb3IgKGkgPSAwOyBpIDwgbmJfZXJyb3JzOyBpKyspIHsKKyAg ICBmb3IgKGludCBpID0gMDsgaSA8IG5iX2Vycm9yczsgaSsrKSB7CiAgICAgICAgIGRvdWJsZSB2 YWx1ZSA9IDAuOwogCi0gICAgICAgIGZvciAoaiA9IC1hcl9vcmRlcjsgaiA8PSBhcl9vcmRlcjsg aisrKQorICAgICAgICBmb3IgKGludCBqID0gLWFyX29yZGVyOyBqIDw9IGFyX29yZGVyOyBqKysp CiAgICAgICAgICAgICBpZiAoZmluZF9pbmRleChpbmRleCwgaW5kZXhbaV0gLSBqLCBuYl9lcnJv cnMpKQogICAgICAgICAgICAgICAgIHZhbHVlIC09IHNyY1tpbmRleFtpXSAtIGpdICogYXV4aWxp YXJ5W2FicyhqKV07CiAKQEAgLTM4Niw5ICszNzksMTEgQEAgc3RhdGljIGludCBkZXRlY3RfY2xp cHMoQXVkaW9EZWNsaWNrQ29udGV4dCAqcywgRGVjbGlja0NoYW5uZWwgKmMsCiAgICAgICAgICAg ICAgICAgICAgICAgICBjb25zdCBkb3VibGUgKnNyYywgZG91YmxlICpkc3QpCiB7CiAgICAgY29u c3QgZG91YmxlIHRocmVzaG9sZCA9IHMtPnRocmVzaG9sZDsKKyAgICBjb25zdCBpbnQgd2luZG93 X3NpemUgPSBzLT53aW5kb3dfc2l6ZTsKKyAgICBjb25zdCBpbnQgYXJfb3JkZXIgPSBzLT5hcl9v cmRlcjsKICAgICBkb3VibGUgbWF4X2FtcGxpdHVkZSA9IDA7CiAgICAgdW5zaWduZWQgKmhpc3Rv Z3JhbTsKLSAgICBpbnQgaSwgbmJfY2xpcHMgPSAwOworICAgIGludCBuYl9jbGlwcyA9IDA7CiAK ICAgICBhdl9mYXN0X21hbGxvYygmYy0+aGlzdG9ncmFtLCAmYy0+aGlzdG9ncmFtX3NpemUsIHMt Pm5iX2hiaW5zICogc2l6ZW9mKCpjLT5oaXN0b2dyYW0pKTsKICAgICBpZiAoIWMtPmhpc3RvZ3Jh bSkKQEAgLTM5Niw3ICszOTEsNyBAQCBzdGF0aWMgaW50IGRldGVjdF9jbGlwcyhBdWRpb0RlY2xp Y2tDb250ZXh0ICpzLCBEZWNsaWNrQ2hhbm5lbCAqYywKICAgICBoaXN0b2dyYW0gPSBjLT5oaXN0 b2dyYW07CiAgICAgbWVtc2V0KGhpc3RvZ3JhbSwgMCwgc2l6ZW9mKCpoaXN0b2dyYW0pICogcy0+ bmJfaGJpbnMpOwogCi0gICAgZm9yIChpID0gMDsgaSA8IHMtPndpbmRvd19zaXplOyBpKyspIHsK KyAgICBmb3IgKGludCBpID0gMDsgaSA8IHdpbmRvd19zaXplOyBpKyspIHsKICAgICAgICAgY29u c3QgdW5zaWduZWQgaW5kZXggPSBmbWluKGZhYnMoc3JjW2ldKSwgMSkgKiAocy0+bmJfaGJpbnMg LSAxKTsKIAogICAgICAgICBoaXN0b2dyYW1baW5kZXhdKys7CkBAIC00MDQsNyArMzk5LDcgQEAg c3RhdGljIGludCBkZXRlY3RfY2xpcHMoQXVkaW9EZWNsaWNrQ29udGV4dCAqcywgRGVjbGlja0No YW5uZWwgKmMsCiAgICAgICAgIGNsaXBbaV0gPSAwOwogICAgIH0KIAotICAgIGZvciAoaSA9IHMt Pm5iX2hiaW5zIC0gMTsgaSA+IDE7IGktLSkgeworICAgIGZvciAoaW50IGkgPSBzLT5uYl9oYmlu cyAtIDE7IGkgPiAxOyBpLS0pIHsKICAgICAgICAgaWYgKGhpc3RvZ3JhbVtpXSkgewogICAgICAg ICAgICAgaWYgKGhpc3RvZ3JhbVtpXSAvIChkb3VibGUpRkZNQVgoaGlzdG9ncmFtW2kgLSAxXSwg MSkgPiB0aHJlc2hvbGQpIHsKICAgICAgICAgICAgICAgICBtYXhfYW1wbGl0dWRlID0gaSAvIChk b3VibGUpcy0+bmJfaGJpbnM7CkBAIC00MTQsMTUgKzQwOSwxNSBAQCBzdGF0aWMgaW50IGRldGVj dF9jbGlwcyhBdWRpb0RlY2xpY2tDb250ZXh0ICpzLCBEZWNsaWNrQ2hhbm5lbCAqYywKICAgICB9 CiAKICAgICBpZiAobWF4X2FtcGxpdHVkZSA+IDAuKSB7Ci0gICAgICAgIGZvciAoaSA9IDA7IGkg PCBzLT53aW5kb3dfc2l6ZTsgaSsrKSB7CisgICAgICAgIGZvciAoaW50IGkgPSAwOyBpIDwgd2lu ZG93X3NpemU7IGkrKykgewogICAgICAgICAgICAgY2xpcFtpXSA9IGZhYnMoc3JjW2ldKSA+PSBt YXhfYW1wbGl0dWRlOwogICAgICAgICB9CiAgICAgfQogCi0gICAgbWVtc2V0KGNsaXAsIDAsIHMt PmFyX29yZGVyICogc2l6ZW9mKCpjbGlwKSk7Ci0gICAgbWVtc2V0KGNsaXAgKyAocy0+d2luZG93 X3NpemUgLSBzLT5hcl9vcmRlciksIDAsIHMtPmFyX29yZGVyICogc2l6ZW9mKCpjbGlwKSk7Cisg ICAgbWVtc2V0KGNsaXAsIDAsIGFyX29yZGVyICogc2l6ZW9mKCpjbGlwKSk7CisgICAgbWVtc2V0 KGNsaXAgKyAod2luZG93X3NpemUgLSBhcl9vcmRlciksIDAsIGFyX29yZGVyICogc2l6ZW9mKCpj bGlwKSk7CiAKLSAgICBmb3IgKGkgPSBzLT5hcl9vcmRlcjsgaSA8IHMtPndpbmRvd19zaXplIC0g cy0+YXJfb3JkZXI7IGkrKykKKyAgICBmb3IgKGludCBpID0gYXJfb3JkZXI7IGkgPCB3aW5kb3df c2l6ZSAtIGFyX29yZGVyOyBpKyspCiAgICAgICAgIGlmIChjbGlwW2ldKQogICAgICAgICAgICAg aW5kZXhbbmJfY2xpcHMrK10gPSBpOwogCkBAIC00MzYsMzUgKzQzMSwzNyBAQCBzdGF0aWMgaW50 IGRldGVjdF9jbGlja3MoQXVkaW9EZWNsaWNrQ29udGV4dCAqcywgRGVjbGlja0NoYW5uZWwgKmMs CiAgICAgICAgICAgICAgICAgICAgICAgICAgY29uc3QgZG91YmxlICpzcmMsIGRvdWJsZSAqZHN0 KQogewogICAgIGNvbnN0IGRvdWJsZSB0aHJlc2hvbGQgPSBzLT50aHJlc2hvbGQ7Ci0gICAgaW50 IGksIGosIG5iX2NsaWNrcyA9IDAsIHByZXYgPSAtMTsKKyAgICBjb25zdCBpbnQgd2luZG93X3Np emUgPSBzLT53aW5kb3dfc2l6ZTsKKyAgICBpbnQgbmJfY2xpY2tzID0gMCwgcHJldiA9IC0xOwor ICAgIGNvbnN0IGludCBhcl9vcmRlciA9IHMtPmFyX29yZGVyOwogCi0gICAgbWVtc2V0KGRldGVj dGlvbiwgMCwgcy0+d2luZG93X3NpemUgKiBzaXplb2YoKmRldGVjdGlvbikpOworICAgIG1lbXNl dChkZXRlY3Rpb24sIDAsIHdpbmRvd19zaXplICogc2l6ZW9mKCpkZXRlY3Rpb24pKTsKIAotICAg IGZvciAoaSA9IHMtPmFyX29yZGVyOyBpIDwgcy0+d2luZG93X3NpemU7IGkrKykgewotICAgICAg ICBmb3IgKGogPSAwOyBqIDw9IHMtPmFyX29yZGVyOyBqKyspIHsKKyAgICBmb3IgKGludCBpID0g YXJfb3JkZXI7IGkgPCB3aW5kb3dfc2l6ZTsgaSsrKSB7CisgICAgICAgIGZvciAoaW50IGogPSAw OyBqIDw9IGFyX29yZGVyOyBqKyspIHsKICAgICAgICAgICAgIGRldGVjdGlvbltpXSArPSBhY29l ZmZpY2llbnRzW2pdICogc3JjW2kgLSBqXTsKICAgICAgICAgfQogICAgIH0KIAotICAgIGZvciAo aSA9IDA7IGkgPCBzLT53aW5kb3dfc2l6ZTsgaSsrKSB7CisgICAgZm9yIChpbnQgaSA9IDA7IGkg PCB3aW5kb3dfc2l6ZTsgaSsrKSB7CiAgICAgICAgIGNsaWNrW2ldID0gZmFicyhkZXRlY3Rpb25b aV0pID4gc2lnbWFlICogdGhyZXNob2xkOwogICAgICAgICBkc3RbaV0gPSBzcmNbaV07CiAgICAg fQogCi0gICAgZm9yIChpID0gMDsgaSA8IHMtPndpbmRvd19zaXplOyBpKyspIHsKKyAgICBmb3Ig KGludCBpID0gMDsgaSA8IHdpbmRvd19zaXplOyBpKyspIHsKICAgICAgICAgaWYgKCFjbGlja1tp XSkKICAgICAgICAgICAgIGNvbnRpbnVlOwogCiAgICAgICAgIGlmIChwcmV2ID49IDAgJiYgKGkg PiBwcmV2ICsgMSkgJiYgKGkgPD0gcy0+bmJfYnVyc3Rfc2FtcGxlcyArIHByZXYpKQotICAgICAg ICAgICAgZm9yIChqID0gcHJldiArIDE7IGogPCBpOyBqKyspCisgICAgICAgICAgICBmb3IgKGlu dCBqID0gcHJldiArIDE7IGogPCBpOyBqKyspCiAgICAgICAgICAgICAgICAgY2xpY2tbal0gPSAx OwogICAgICAgICBwcmV2ID0gaTsKICAgICB9CiAKLSAgICBtZW1zZXQoY2xpY2ssIDAsIHMtPmFy X29yZGVyICogc2l6ZW9mKCpjbGljaykpOwotICAgIG1lbXNldChjbGljayArIChzLT53aW5kb3df c2l6ZSAtIHMtPmFyX29yZGVyKSwgMCwgcy0+YXJfb3JkZXIgKiBzaXplb2YoKmNsaWNrKSk7Cisg ICAgbWVtc2V0KGNsaWNrLCAwLCBhcl9vcmRlciAqIHNpemVvZigqY2xpY2spKTsKKyAgICBtZW1z ZXQoY2xpY2sgKyAod2luZG93X3NpemUgLSBhcl9vcmRlciksIDAsIGFyX29yZGVyICogc2l6ZW9m KCpjbGljaykpOwogCi0gICAgZm9yIChpID0gcy0+YXJfb3JkZXI7IGkgPCBzLT53aW5kb3dfc2l6 ZSAtIHMtPmFyX29yZGVyOyBpKyspCisgICAgZm9yIChpbnQgaSA9IGFyX29yZGVyOyBpIDwgd2lu ZG93X3NpemUgLSBhcl9vcmRlcjsgaSsrKQogICAgICAgICBpZiAoY2xpY2tbaV0pCiAgICAgICAg ICAgICBpbmRleFtuYl9jbGlja3MrK10gPSBpOwogCkBAIC00NzgsMzMgKzQ3NSwzNSBAQCBzdGF0 aWMgaW50IGRldGVjdF9zdXJnZXMoQXVkaW9EZWNsaWNrQ29udGV4dCAqcywgRGVjbGlja0NoYW5u ZWwgKmMsCiAgICAgICAgICAgICAgICAgICAgICAgICAgY29uc3QgZG91YmxlICpzcmMsIGRvdWJs ZSAqZHN0KQogewogICAgIGNvbnN0IGRvdWJsZSB0aHJlc2hvbGQgPSBzLT50aHJlc2hvbGQ7Cisg ICAgY29uc3QgaW50IHdpbmRvd19zaXplID0gcy0+d2luZG93X3NpemU7CiAgICAgY29uc3QgaW50 IHNpemUgPSBzLT5uYl9zdXJnZV9zYW1wbGVzICogMjsKLSAgICBpbnQgaSwgaiwgbmJfc3VyZ2Vz ID0gMDsKKyAgICBjb25zdCBpbnQgYXJfb3JkZXIgPSBzLT5hcl9vcmRlcjsKKyAgICBpbnQgbmJf c3VyZ2VzID0gMDsKIAotICAgIG1lbXNldChkZXRlY3Rpb24sIDAsIHMtPndpbmRvd19zaXplICog c2l6ZW9mKCpkZXRlY3Rpb24pKTsKKyAgICBtZW1zZXQoZGV0ZWN0aW9uLCAwLCB3aW5kb3dfc2l6 ZSAqIHNpemVvZigqZGV0ZWN0aW9uKSk7CiAKLSAgICBmb3IgKGkgPSBzLT5hcl9vcmRlcjsgaSA8 IHMtPndpbmRvd19zaXplOyBpKyspIHsKLSAgICAgICAgZm9yIChqID0gMDsgaiA8PSBzLT5hcl9v cmRlcjsgaisrKSB7CisgICAgZm9yIChpbnQgaSA9IGFyX29yZGVyOyBpIDwgd2luZG93X3NpemU7 IGkrKykgeworICAgICAgICBmb3IgKGludCBqID0gMDsgaiA8PSBhcl9vcmRlcjsgaisrKSB7CiAg ICAgICAgICAgICBkZXRlY3Rpb25baV0gKz0gYWNvZWZmaWNpZW50c1tqXSAqIHNyY1tpIC0gal07 CiAgICAgICAgIH0KICAgICB9CiAKLSAgICBmb3IgKGkgPSAwOyBpIDwgcy0+d2luZG93X3NpemU7 IGkrKykgeworICAgIGZvciAoaW50IGkgPSAwOyBpIDwgd2luZG93X3NpemU7IGkrKykgewogICAg ICAgICBzdXJnZVtpXSA9IGZhYnMoZGV0ZWN0aW9uW2ldKSA+IHNpZ21hZSAqIHRocmVzaG9sZDsK ICAgICAgICAgZHN0W2ldID0gc3JjW2ldOwogICAgIH0KIAotICAgIGZvciAoaSA9IDA7IGkgPCBz LT53aW5kb3dfc2l6ZTspIHsKKyAgICBmb3IgKGludCBpID0gMDsgaSA8IHdpbmRvd19zaXplOykg ewogICAgICAgICBpZiAoIXN1cmdlW2krK10pCiAgICAgICAgICAgICBjb250aW51ZTsKLSAgICAg ICAgbWVtc2V0KHN1cmdlICsgRkZNQVgoaSAtIHNpemUvMiwgMCksIDEsIEZGTUlOKHNpemUsIHMt PndpbmRvd19zaXplIC0gaSkpOworICAgICAgICBtZW1zZXQoc3VyZ2UgKyBGRk1BWChpIC0gc2l6 ZS8yLCAwKSwgMSwgRkZNSU4oc2l6ZSwgd2luZG93X3NpemUgLSBpKSk7CiAgICAgICAgIGkgKz0g c2l6ZS8yOwogICAgIH0KIAotICAgIG1lbXNldChzdXJnZSwgMCwgcy0+YXJfb3JkZXIgKiBzaXpl b2YoKnN1cmdlKSk7Ci0gICAgbWVtc2V0KHN1cmdlICsgKHMtPndpbmRvd19zaXplIC0gcy0+YXJf b3JkZXIpLCAwLCBzLT5hcl9vcmRlciAqIHNpemVvZigqc3VyZ2UpKTsKKyAgICBtZW1zZXQoc3Vy Z2UsIDAsIGFyX29yZGVyICogc2l6ZW9mKCpzdXJnZSkpOworICAgIG1lbXNldChzdXJnZSArICh3 aW5kb3dfc2l6ZSAtIGFyX29yZGVyKSwgMCwgYXJfb3JkZXIgKiBzaXplb2YoKnN1cmdlKSk7CiAK LSAgICBmb3IgKGkgPSBzLT5hcl9vcmRlcjsgaSA8IHMtPndpbmRvd19zaXplIC0gcy0+YXJfb3Jk ZXI7IGkrKykKKyAgICBmb3IgKGludCBpID0gYXJfb3JkZXI7IGkgPCB3aW5kb3dfc2l6ZSAtIGFy X29yZGVyOyBpKyspCiAgICAgICAgIGlmIChzdXJnZVtpXSkKICAgICAgICAgICAgIGluZGV4W25i X3N1cmdlcysrXSA9IGk7CiAKQEAgLTUyOCw3ICs1MjcsNyBAQCBzdGF0aWMgaW50IGZpbHRlcl9j aGFubmVsKEFWRmlsdGVyQ29udGV4dCAqY3R4LCB2b2lkICphcmcsIGludCBjaCwgaW50IG5iX2pv YnMpCiAgICAgY29uc3QgZG91YmxlICp3ID0gcy0+d2luZG93X2Z1bmNfbHV0OwogICAgIERlY2xp Y2tDaGFubmVsICpjID0gJnMtPmNoYW5bY2hdOwogICAgIGRvdWJsZSBzaWdtYWU7Ci0gICAgaW50 IGosIHJldDsKKyAgICBpbnQgcmV0OwogCiAgICAgc2lnbWFlID0gYXV0b3JlZ3Jlc3Npb24oc3Jj LCBzLT5hcl9vcmRlciwgcy0+d2luZG93X3NpemUsIGMtPmFjb2VmZmljaWVudHMsIGMtPmFjb3Jy ZWxhdGlvbiwgYy0+dG1wKTsKIApAQCAtNTQ5LDcgKzU0OCw3IEBAIHN0YXRpYyBpbnQgZmlsdGVy X2NoYW5uZWwoQVZGaWx0ZXJDb250ZXh0ICpjdHgsIHZvaWQgKmFyZywgaW50IGNoLCBpbnQgbmJf am9icykKIAogICAgICAgICAgICAgYXZfYXVkaW9fZmlmb19wZWVrKHMtPmVmaWZvLCAodm9pZCoq KXMtPmVuYWJsZWQtPmV4dGVuZGVkX2RhdGEsIHMtPndpbmRvd19zaXplKTsKIAotICAgICAgICAg ICAgZm9yIChqID0gMDsgaiA8IG5iX2Vycm9yczsgaisrKSB7CisgICAgICAgICAgICBmb3IgKGlu dCBqID0gMDsgaiA8IG5iX2Vycm9yczsgaisrKSB7CiAgICAgICAgICAgICAgICAgaWYgKGVuYWJs ZWRbaW5kZXhbal1dKSB7CiAgICAgICAgICAgICAgICAgICAgIGRzdFtpbmRleFtqXV0gPSBpbnRl cnBvbGF0ZWRbal07CiAgICAgICAgICAgICAgICAgICAgIGlzW2luZGV4W2pdXSA9IDE7CkBAIC01 NjEsMTUgKzU2MCwxNSBAQCBzdGF0aWMgaW50IGZpbHRlcl9jaGFubmVsKEFWRmlsdGVyQ29udGV4 dCAqY3R4LCB2b2lkICphcmcsIGludCBjaCwgaW50IG5iX2pvYnMpCiAgICAgfQogCiAgICAgaWYg KHMtPm1ldGhvZCA9PSAwKSB7Ci0gICAgICAgIGZvciAoaiA9IDA7IGogPCBzLT53aW5kb3dfc2l6 ZTsgaisrKQorICAgICAgICBmb3IgKGludCBqID0gMDsgaiA8IHMtPndpbmRvd19zaXplOyBqKysp CiAgICAgICAgICAgICBidWZbal0gKz0gZHN0W2pdICogd1tqXTsKICAgICB9IGVsc2UgewogICAg ICAgICBjb25zdCBpbnQgc2tpcCA9IHMtPm92ZXJsYXBfc2tpcDsKIAotICAgICAgICBmb3IgKGog PSAwOyBqIDwgcy0+aG9wX3NpemU7IGorKykKKyAgICAgICAgZm9yIChpbnQgaiA9IDA7IGogPCBz LT5ob3Bfc2l6ZTsgaisrKQogICAgICAgICAgICAgYnVmW2pdID0gZHN0W3NraXAgKyBqXTsKICAg ICB9Ci0gICAgZm9yIChqID0gMDsgaiA8IHMtPmhvcF9zaXplOyBqKyspCisgICAgZm9yIChpbnQg aiA9IDA7IGogPCBzLT5ob3Bfc2l6ZTsgaisrKQogICAgICAgICBwdHJbal0gPSBidWZbal07CiAK ICAgICBtZW1tb3ZlKGJ1ZiwgYnVmICsgcy0+aG9wX3NpemUsIChzLT53aW5kb3dfc2l6ZSAqIDIg LSBzLT5ob3Bfc2l6ZSkgKiBzaXplb2YoKmJ1ZikpOwpAQCAtNTg2LDcgKzU4NSw3IEBAIHN0YXRp YyBpbnQgZmlsdGVyX2ZyYW1lKEFWRmlsdGVyTGluayAqaW5saW5rKQogICAgIEFWRmlsdGVyTGlu ayAqb3V0bGluayA9IGN0eC0+b3V0cHV0c1swXTsKICAgICBBdWRpb0RlY2xpY2tDb250ZXh0ICpz ID0gY3R4LT5wcml2OwogICAgIEFWRnJhbWUgKm91dCA9IE5VTEw7Ci0gICAgaW50IHJldCA9IDAs IGosIGNoLCBkZXRlY3RlZF9lcnJvcnMgPSAwOworICAgIGludCByZXQgPSAwLCBjaCwgZGV0ZWN0 ZWRfZXJyb3JzID0gMDsKICAgICBUaHJlYWREYXRhIHRkOwogCiAgICAgb3V0ID0gZmZfZ2V0X2F1 ZGlvX2J1ZmZlcihvdXRsaW5rLCBzLT5ob3Bfc2l6ZSk7CkBAIC02MDYsNyArNjA1LDcgQEAgc3Rh dGljIGludCBmaWx0ZXJfZnJhbWUoQVZGaWx0ZXJMaW5rICppbmxpbmspCiAgICAgZm9yIChjaCA9 IDA7IGNoIDwgcy0+aW4tPmNoX2xheW91dC5uYl9jaGFubmVsczsgY2grKykgewogICAgICAgICBk b3VibGUgKmlzID0gKGRvdWJsZSAqKXMtPmlzLT5leHRlbmRlZF9kYXRhW2NoXTsKIAotICAgICAg ICBmb3IgKGogPSAwOyBqIDwgcy0+aG9wX3NpemU7IGorKykgeworICAgICAgICBmb3IgKGludCBq ID0gMDsgaiA8IHMtPmhvcF9zaXplOyBqKyspIHsKICAgICAgICAgICAgIGlmIChpc1tqXSkKICAg ICAgICAgICAgICAgICBkZXRlY3RlZF9lcnJvcnMrKzsKICAgICAgICAgfQpAQCAtNzIxLDcgKzcy MCw2IEBAIHN0YXRpYyBhdl9jb2xkIGludCBpbml0KEFWRmlsdGVyQ29udGV4dCAqY3R4KQogc3Rh dGljIGF2X2NvbGQgdm9pZCB1bmluaXQoQVZGaWx0ZXJDb250ZXh0ICpjdHgpCiB7CiAgICAgQXVk aW9EZWNsaWNrQ29udGV4dCAqcyA9IGN0eC0+cHJpdjsKLSAgICBpbnQgaTsKIAogICAgIGF2X2xv ZyhjdHgsIEFWX0xPR19JTkZPLCAiRGV0ZWN0ZWQgJXMgaW4gJSJQUklkNjQiIG9mICUiUFJJZDY0 IiBzYW1wbGVzICglZyUlKS5cbiIsCiAgICAgICAgICAgIGZpbHRlcl9tb2Rlc1tzLT5tb2RlXSwg cy0+ZGV0ZWN0ZWRfZXJyb3JzLApAQCAtNzM3LDcgKzczNSw3IEBAIHN0YXRpYyBhdl9jb2xkIHZv aWQgdW5pbml0KEFWRmlsdGVyQ29udGV4dCAqY3R4KQogICAgIGF2X2ZyYW1lX2ZyZWUoJnMtPmlz KTsKIAogICAgIGlmIChzLT5jaGFuKSB7Ci0gICAgICAgIGZvciAoaSA9IDA7IGkgPCBzLT5uYl9j aGFubmVsczsgaSsrKSB7CisgICAgICAgIGZvciAoaW50IGkgPSAwOyBpIDwgcy0+bmJfY2hhbm5l bHM7IGkrKykgewogICAgICAgICAgICAgRGVjbGlja0NoYW5uZWwgKmMgPSAmcy0+Y2hhbltpXTsK IAogICAgICAgICAgICAgYXZfZnJlZXAoJmMtPmRldGVjdGlvbik7Ci0tIAoyLjM5LjEKCg== --0000000000003ce0060602842b8c Content-Type: text/x-patch; charset="US-ASCII"; name="0001-avfilter-add-adesurge-filter.patch" Content-Disposition: attachment; filename="0001-avfilter-add-adesurge-filter.patch" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_ll4928h92 RnJvbSBhZjU2NWY1N2Y3MzNhZjMyN2VkYzFlMTcyNGUzMWEzYzVmMWZlNDRmIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBQYXVsIEIgTWFob2wgPG9uZW1kYUBnbWFpbC5jb20+CkRhdGU6 IFdlZCwgOSBBdWcgMjAyMyAxODoyMToyNSArMDIwMApTdWJqZWN0OiBbUEFUQ0ggMS8zXSBhdmZp bHRlcjogYWRkIGFkZXN1cmdlIGZpbHRlcgoKU2lnbmVkLW9mZi1ieTogUGF1bCBCIE1haG9sIDxv bmVtZGFAZ21haWwuY29tPgotLS0KIGRvYy9maWx0ZXJzLnRleGkgICAgICAgICAgfCA1MSArKysr KysrKysrKysrKysrKysrKysrCiBsaWJhdmZpbHRlci9NYWtlZmlsZSAgICAgIHwgIDEgKwogbGli YXZmaWx0ZXIvYWZfYWRlY2xpY2suYyB8IDkxICsrKysrKysrKysrKysrKysrKysrKysrKysrKysr KysrKysrKystLQogbGliYXZmaWx0ZXIvYWxsZmlsdGVycy5jICB8ICAxICsKIDQgZmlsZXMgY2hh bmdlZCwgMTQwIGluc2VydGlvbnMoKyksIDQgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZG9j L2ZpbHRlcnMudGV4aSBiL2RvYy9maWx0ZXJzLnRleGkKaW5kZXggYjMwZmY4MjQwYi4uZTA0MWFk YzQwZiAxMDA2NDQKLS0tIGEvZG9jL2ZpbHRlcnMudGV4aQorKysgYi9kb2MvZmlsdGVycy50ZXhp CkBAIC05MTMsNiArOTEzLDU3IEBAIENvbXB1dGUgZGVyaXZhdGl2ZS9pbnRlZ3JhbCBvZiBhdWRp byBzdHJlYW0uCiAKIEFwcGx5aW5nIGJvdGggZmlsdGVycyBvbmUgYWZ0ZXIgYW5vdGhlciBwcm9k dWNlcyBvcmlnaW5hbCBhdWRpby4KIAorQHNlY3Rpb24gYWRlc3VyZ2UKK1JlbW92ZSBiaWcgc3Vy Z2UgaW4gYXVkaW8gc2FtcGxlcyBmcm9tIGlucHV0IGF1ZGlvLgorCitTYW1wbGVzIGRldGVjdGVk IGFzIGluc3RhbnQgaW5jcmVhc2Ugb3IgZGVjcmVhc2Ugb2Ygdm9sdW1lIGFyZSByZXBsYWNlZCBi eQoraW50ZXJwb2xhdGVkIHNhbXBsZXMgdXNpbmcgYXV0b3JlZ3Jlc3NpdmUgbW9kZWxsaW5nLgor CitAdGFibGUgQG9wdGlvbgorQGl0ZW0gd2luZG93LCB3CitTZXQgd2luZG93IHNpemUsIGluIG1p bGxpc2Vjb25kcy4gQWxsb3dlZCByYW5nZSBpcyBmcm9tIEBjb2RlezEwfSB0bworQGNvZGV7MTAw fS4gRGVmYXVsdCB2YWx1ZSBpcyBAY29kZXs4NX0gbWlsbGlzZWNvbmRzLgorVGhpcyBzZXRzIHNp emUgb2Ygd2luZG93IHdoaWNoIHdpbGwgYmUgcHJvY2Vzc2VkIGF0IG9uY2UuCisKK0BpdGVtIG92 ZXJsYXAsIG8KK1NldCB3aW5kb3cgb3ZlcmxhcCwgaW4gcGVyY2VudGFnZSBvZiB3aW5kb3cgc2l6 ZS4gQWxsb3dlZCByYW5nZSBpcyBmcm9tCitAY29kZXs1MH0gdG8gQGNvZGV7OTV9LiBEZWZhdWx0 IHZhbHVlIGlzIEBjb2Rlezc1fSBwZXJjZW50LgorU2V0dGluZyB0aGlzIHRvIGEgdmVyeSBoaWdo IHZhbHVlIG1heSBpbmNyZWFzZXMgc3VyZ2VzIHJlbW92YWwgYnV0IG1ha2VzCit3aG9sZSBwcm9j ZXNzIG11Y2ggc2xvd2VyLgorCitAaXRlbSBhcm9yZGVyLCBhCitTZXQgYXV0b3JlZ3Jlc3Npb24g b3JkZXIsIGluIHBlcmNlbnRhZ2Ugb2Ygd2luZG93IHNpemUuIEFsbG93ZWQgcmFuZ2UgaXMgZnJv bQorQGNvZGV7MH0gdG8gQGNvZGV7MjV9LiBEZWZhdWx0IHZhbHVlIGlzIEBjb2RlezAuNX0gcGVy Y2VudC4gVGhpcyBvcHRpb24gYWxzbworY29udHJvbHMgcXVhbGl0eSBvZiBpbnRlcnBvbGF0ZWQg c2FtcGxlcyB1c2luZyBuZWlnaGJvdXIgZ29vZCBzYW1wbGVzLgorCitAaXRlbSB0aHJlc2hvbGQs IHQKK1NldCB0aHJlc2hvbGQgdmFsdWUuIEFsbG93ZWQgcmFuZ2UgaXMgZnJvbSBAY29kZXsxfSB0 byBAY29kZXsxMDB9LgorRGVmYXVsdCB2YWx1ZSBpcyBAY29kZXsyMH0uCitUaGlzIGNvbnRyb2xz IHRoZSBzdHJlbmd0aCBvZiBzdXJnZXMgd2hpY2ggaXMgZ29pbmcgdG8gYmUgcmVtb3ZlZC4KK1Ro ZSBsb3dlciB2YWx1ZSwgdGhlIG1vcmUgc2FtcGxlcyB3aWxsIGJlIGRldGVjdGVkIGFzIHN1cmdl cy4KKworQGl0ZW0gc3VyZ2VzLCBzCitTZXQgc3VyZ2VzIHNpemUsIGluIG51bWJlciBvZiBzYW1w bGVzLiBBbGxvd2VkIHJhbmdlIGlzIEBjb2RlezF9IHRvCitAY29kZXs1MH0uIERlZmF1bHQgdmFs dWUgaXMgQGNvZGV7NX0uCitGb3IgYW55IHNhbXBsZSBkZXRlY3RlZCBhcyBzdXJnZSB0aGVuIGFs c28gaXRzIHN1cnJvdW5kaW5nIHNhbXBsZXMgb2YgdGhpcyBzaXplCit3aWxsIGJlIGludGVycG9s YXRlZCBhbHNvLgorCitAaXRlbSBtZXRob2QsIG0KK1NldCBvdmVybGFwIG1ldGhvZC4KKworSXQg YWNjZXB0cyB0aGUgZm9sbG93aW5nIHZhbHVlczoKK0B0YWJsZSBAb3B0aW9uCitAaXRlbSBhZGQs IGEKK1NlbGVjdCBvdmVybGFwLWFkZCBtZXRob2QuIEV2ZW4gbm90IGludGVycG9sYXRlZCBzYW1w bGVzIGFyZSBzbGlnaHRseQorY2hhbmdlZCB3aXRoIHRoaXMgbWV0aG9kLgorCitAaXRlbSBzYXZl LCBzCitTZWxlY3Qgb3ZlcmxhcC1zYXZlIG1ldGhvZC4gTm90IGludGVycG9sYXRlZCBzYW1wbGVz IHJlbWFpbiB1bmNoYW5nZWQuCitAZW5kIHRhYmxlCisKK0RlZmF1bHQgdmFsdWUgaXMgQGNvZGV7 c30uCitAZW5kIHRhYmxlCisKIEBzZWN0aW9uIGFkcmMKIAogQXBwbHkgc3BlY3RyYWwgZHluYW1p YyByYW5nZSBjb250cm9sbGVyIGZpbHRlciB0byBpbnB1dCBhdWRpbyBzdHJlYW0uCmRpZmYgLS1n aXQgYS9saWJhdmZpbHRlci9NYWtlZmlsZSBiL2xpYmF2ZmlsdGVyL01ha2VmaWxlCmluZGV4IDMw YTBlMjJlZjguLmIyNmE4NWE3ZDIgMTAwNjQ0Ci0tLSBhL2xpYmF2ZmlsdGVyL01ha2VmaWxlCisr KyBiL2xpYmF2ZmlsdGVyL01ha2VmaWxlCkBAIC00OSw2ICs0OSw3IEBAIE9CSlMtJChDT05GSUdf QURFQ09SUkVMQVRFX0ZJTFRFUikgICAgICAgICAgICs9IGFmX2FkZWNvcnJlbGF0ZS5vCiBPQkpT LSQoQ09ORklHX0FERUxBWV9GSUxURVIpICAgICAgICAgICAgICAgICArPSBhZl9hZGVsYXkubwog T0JKUy0kKENPTkZJR19BREVOT1JNX0ZJTFRFUikgICAgICAgICAgICAgICAgKz0gYWZfYWRlbm9y bS5vCiBPQkpTLSQoQ09ORklHX0FERVJJVkFUSVZFX0ZJTFRFUikgICAgICAgICAgICArPSBhZl9h ZGVyaXZhdGl2ZS5vCitPQkpTLSQoQ09ORklHX0FERVNVUkdFX0ZJTFRFUikgICAgICAgICAgICAg ICArPSBhZl9hZGVzdXJnZS5vCiBPQkpTLSQoQ09ORklHX0FEUkNfRklMVEVSKSAgICAgICAgICAg ICAgICAgICArPSBhZl9hZHJjLm8KIE9CSlMtJChDT05GSUdfQURZTkFNSUNFUVVBTElaRVJfRklM VEVSKSAgICAgICs9IGFmX2FkeW5hbWljZXF1YWxpemVyLm8KIE9CSlMtJChDT05GSUdfQURZTkFN SUNTTU9PVEhfRklMVEVSKSAgICAgICAgICs9IGFmX2FkeW5hbWljc21vb3RoLm8KZGlmZiAtLWdp dCBhL2xpYmF2ZmlsdGVyL2FmX2FkZWNsaWNrLmMgYi9saWJhdmZpbHRlci9hZl9hZGVjbGljay5j CmluZGV4IDgyMmYzMDY1YjguLjExMzdkYmUyNWIgMTAwNjQ0Ci0tLSBhL2xpYmF2ZmlsdGVyL2Fm X2FkZWNsaWNrLmMKKysrIGIvbGliYXZmaWx0ZXIvYWZfYWRlY2xpY2suYwpAQCAtMjUsNiArMjUs OCBAQAogI2luY2x1ZGUgImZpbHRlcnMuaCIKICNpbmNsdWRlICJpbnRlcm5hbC5oIgogCitzdGF0 aWMgY29uc3QgY2hhciAqZmlsdGVyX21vZGVzW10gPSB7ImNsaWNrcyIsICJjbGlwcyIsICJzdXJn ZXMiIH07CisKIHR5cGVkZWYgc3RydWN0IERlY2xpY2tDaGFubmVsIHsKICAgICBkb3VibGUgKmF1 eGlsaWFyeTsKICAgICBkb3VibGUgKmRldGVjdGlvbjsKQEAgLTU1LDggKzU3LDkgQEAgdHlwZWRl ZiBzdHJ1Y3QgQXVkaW9EZWNsaWNrQ29udGV4dCB7CiAgICAgaW50IG1ldGhvZDsKICAgICBpbnQg bmJfaGJpbnM7CiAKLSAgICBpbnQgaXNfZGVjbGlwOworICAgIGludCBtb2RlOwogICAgIGludCBh cl9vcmRlcjsKKyAgICBpbnQgbmJfc3VyZ2Vfc2FtcGxlczsKICAgICBpbnQgbmJfYnVyc3Rfc2Ft cGxlczsKICAgICBpbnQgd2luZG93X3NpemU7CiAgICAgaW50IGhvcF9zaXplOwpAQCAtNDY4LDYg KzQ3MSw0NiBAQCBzdGF0aWMgaW50IGRldGVjdF9jbGlja3MoQXVkaW9EZWNsaWNrQ29udGV4dCAq cywgRGVjbGlja0NoYW5uZWwgKmMsCiAgICAgcmV0dXJuIG5iX2NsaWNrczsKIH0KIAorc3RhdGlj IGludCBkZXRlY3Rfc3VyZ2VzKEF1ZGlvRGVjbGlja0NvbnRleHQgKnMsIERlY2xpY2tDaGFubmVs ICpjLAorICAgICAgICAgICAgICAgICAgICAgICAgIGRvdWJsZSBzaWdtYWUsCisgICAgICAgICAg ICAgICAgICAgICAgICAgZG91YmxlICpkZXRlY3Rpb24sIGRvdWJsZSAqYWNvZWZmaWNpZW50cywK KyAgICAgICAgICAgICAgICAgICAgICAgICB1aW50OF90ICpzdXJnZSwgaW50ICppbmRleCwKKyAg ICAgICAgICAgICAgICAgICAgICAgICBjb25zdCBkb3VibGUgKnNyYywgZG91YmxlICpkc3QpCit7 CisgICAgY29uc3QgZG91YmxlIHRocmVzaG9sZCA9IHMtPnRocmVzaG9sZDsKKyAgICBjb25zdCBp bnQgc2l6ZSA9IHMtPm5iX3N1cmdlX3NhbXBsZXMgKiAyOworICAgIGludCBpLCBqLCBuYl9zdXJn ZXMgPSAwOworCisgICAgbWVtc2V0KGRldGVjdGlvbiwgMCwgcy0+d2luZG93X3NpemUgKiBzaXpl b2YoKmRldGVjdGlvbikpOworCisgICAgZm9yIChpID0gcy0+YXJfb3JkZXI7IGkgPCBzLT53aW5k b3dfc2l6ZTsgaSsrKSB7CisgICAgICAgIGZvciAoaiA9IDA7IGogPD0gcy0+YXJfb3JkZXI7IGor KykgeworICAgICAgICAgICAgZGV0ZWN0aW9uW2ldICs9IGFjb2VmZmljaWVudHNbal0gKiBzcmNb aSAtIGpdOworICAgICAgICB9CisgICAgfQorCisgICAgZm9yIChpID0gMDsgaSA8IHMtPndpbmRv d19zaXplOyBpKyspIHsKKyAgICAgICAgc3VyZ2VbaV0gPSBmYWJzKGRldGVjdGlvbltpXSkgPiBz aWdtYWUgKiB0aHJlc2hvbGQ7CisgICAgICAgIGRzdFtpXSA9IHNyY1tpXTsKKyAgICB9CisKKyAg ICBmb3IgKGkgPSAwOyBpIDwgcy0+d2luZG93X3NpemU7KSB7CisgICAgICAgIGlmICghc3VyZ2Vb aSsrXSkKKyAgICAgICAgICAgIGNvbnRpbnVlOworICAgICAgICBtZW1zZXQoc3VyZ2UgKyBGRk1B WChpIC0gc2l6ZS8yLCAwKSwgMSwgRkZNSU4oc2l6ZSwgcy0+d2luZG93X3NpemUgLSBpKSk7Cisg ICAgICAgIGkgKz0gc2l6ZS8yOworICAgIH0KKworICAgIG1lbXNldChzdXJnZSwgMCwgcy0+YXJf b3JkZXIgKiBzaXplb2YoKnN1cmdlKSk7CisgICAgbWVtc2V0KHN1cmdlICsgKHMtPndpbmRvd19z aXplIC0gcy0+YXJfb3JkZXIpLCAwLCBzLT5hcl9vcmRlciAqIHNpemVvZigqc3VyZ2UpKTsKKwor ICAgIGZvciAoaSA9IHMtPmFyX29yZGVyOyBpIDwgcy0+d2luZG93X3NpemUgLSBzLT5hcl9vcmRl cjsgaSsrKQorICAgICAgICBpZiAoc3VyZ2VbaV0pCisgICAgICAgICAgICBpbmRleFtuYl9zdXJn ZXMrK10gPSBpOworCisgICAgcmV0dXJuIG5iX3N1cmdlczsKK30KKwogdHlwZWRlZiBzdHJ1Y3Qg VGhyZWFkRGF0YSB7CiAgICAgQVZGcmFtZSAqb3V0OwogfSBUaHJlYWREYXRhOwpAQCAtNjYxLDEw ICs3MDQsMTQgQEAgc3RhdGljIGF2X2NvbGQgaW50IGluaXQoQVZGaWx0ZXJDb250ZXh0ICpjdHgp CiB7CiAgICAgQXVkaW9EZWNsaWNrQ29udGV4dCAqcyA9IGN0eC0+cHJpdjsKIAotICAgIHMtPmlz X2RlY2xpcCA9ICFzdHJjbXAoY3R4LT5maWx0ZXItPm5hbWUsICJhZGVjbGlwIik7Ci0gICAgaWYg KHMtPmlzX2RlY2xpcCkgeworICAgIGlmICghc3RyY21wKGN0eC0+ZmlsdGVyLT5uYW1lLCAiYWRl c3VyZ2UiKSkgeworICAgICAgICBzLT5tb2RlID0gMjsKKyAgICAgICAgcy0+ZGV0ZWN0b3IgPSBk ZXRlY3Rfc3VyZ2VzOworICAgIH0gZWxzZSBpZiAoIXN0cmNtcChjdHgtPmZpbHRlci0+bmFtZSwg ImFkZWNsaXAiKSkgeworICAgICAgICBzLT5tb2RlID0gMTsKICAgICAgICAgcy0+ZGV0ZWN0b3Ig PSBkZXRlY3RfY2xpcHM7CiAgICAgfSBlbHNlIHsKKyAgICAgICAgcy0+bW9kZSA9IDA7CiAgICAg ICAgIHMtPmRldGVjdG9yID0gZGV0ZWN0X2NsaWNrczsKICAgICB9CiAKQEAgLTY3Nyw3ICs3MjQs NyBAQCBzdGF0aWMgYXZfY29sZCB2b2lkIHVuaW5pdChBVkZpbHRlckNvbnRleHQgKmN0eCkKICAg ICBpbnQgaTsKIAogICAgIGF2X2xvZyhjdHgsIEFWX0xPR19JTkZPLCAiRGV0ZWN0ZWQgJXMgaW4g JSJQUklkNjQiIG9mICUiUFJJZDY0IiBzYW1wbGVzICglZyUlKS5cbiIsCi0gICAgICAgICAgIHMt PmlzX2RlY2xpcCA/ICJjbGlwcyIgOiAiY2xpY2tzIiwgcy0+ZGV0ZWN0ZWRfZXJyb3JzLAorICAg ICAgICAgICBmaWx0ZXJfbW9kZXNbcy0+bW9kZV0sIHMtPmRldGVjdGVkX2Vycm9ycywKICAgICAg ICAgICAgcy0+bmJfc2FtcGxlcywgMTAwLiAqIHMtPmRldGVjdGVkX2Vycm9ycyAvIHMtPm5iX3Nh bXBsZXMpOwogCiAgICAgYXZfYXVkaW9fZmlmb19mcmVlKHMtPmZpZm8pOwpAQCAtNzcyLDMgKzgx OSwzOSBAQCBjb25zdCBBVkZpbHRlciBmZl9hZl9hZGVjbGlwID0gewogICAgIEZJTFRFUl9TSU5H TEVfU0FNUExFRk1UKEFWX1NBTVBMRV9GTVRfREJMUCksCiAgICAgLmZsYWdzICAgICAgICAgPSBB VkZJTFRFUl9GTEFHX1NMSUNFX1RIUkVBRFMgfCBBVkZJTFRFUl9GTEFHX1NVUFBPUlRfVElNRUxJ TkVfSU5URVJOQUwsCiB9OworCitzdGF0aWMgY29uc3QgQVZPcHRpb24gYWRlc3VyZ2Vfb3B0aW9u c1tdID0geworICAgIHsgIndpbmRvdyIsICJzZXQgd2luZG93IHNpemUiLCAgICAgT0ZGU0VUKHcp LCAgICAgICAgIEFWX09QVF9UWVBFX0RPVUJMRSwgey5kYmw9ODV9LCAgICAgMTAsICAxMDAsIEFG IH0sCisgICAgeyAidyIsICJzZXQgd2luZG93IHNpemUiLCAgICAgICAgICBPRkZTRVQodyksICAg ICAgICAgQVZfT1BUX1RZUEVfRE9VQkxFLCB7LmRibD04NX0sICAgICAxMCwgIDEwMCwgQUYgfSwK KyAgICB7ICJvdmVybGFwIiwgInNldCB3aW5kb3cgb3ZlcmxhcCIsIE9GRlNFVChvdmVybGFwKSwg ICBBVl9PUFRfVFlQRV9ET1VCTEUsIHsuZGJsPTc1fSwgICAgIDUwLCAgIDk1LCBBRiB9LAorICAg IHsgIm8iLCAic2V0IHdpbmRvdyBvdmVybGFwIiwgICAgICAgT0ZGU0VUKG92ZXJsYXApLCAgIEFW X09QVF9UWVBFX0RPVUJMRSwgey5kYmw9NzV9LCAgICAgNTAsICAgOTUsIEFGIH0sCisgICAgeyAi YXJvcmRlciIsICJzZXQgYXV0b3JlZ3Jlc3Npb24gb3JkZXIiLCBPRkZTRVQoYXIpLCAgQVZfT1BU X1RZUEVfRE9VQkxFLCB7LmRibD0wLjV9LCAgICAgMCwgICAyNSwgQUYgfSwKKyAgICB7ICJhIiwg InNldCBhdXRvcmVncmVzc2lvbiBvcmRlciIsIE9GRlNFVChhciksICAgICAgICBBVl9PUFRfVFlQ RV9ET1VCTEUsIHsuZGJsPTAuNX0sICAgICAwLCAgIDI1LCBBRiB9LAorICAgIHsgInRocmVzaG9s ZCIsICJzZXQgdGhyZXNob2xkIiwgICAgT0ZGU0VUKHRocmVzaG9sZCksIEFWX09QVF9UWVBFX0RP VUJMRSwgey5kYmw9MjB9LCAgICAgIDEsICAxMDAsIEFGIH0sCisgICAgeyAidCIsICJzZXQgdGhy ZXNob2xkIiwgICAgICAgICAgICBPRkZTRVQodGhyZXNob2xkKSwgQVZfT1BUX1RZUEVfRE9VQkxF LCB7LmRibD0yMH0sICAgICAgMSwgIDEwMCwgQUYgfSwKKyAgICB7ICJzdXJnZXMiLCAic2V0IHN1 cmdlIHNpemUiLCAgICAgIE9GRlNFVChuYl9zdXJnZV9zYW1wbGVzKSwgQVZfT1BUX1RZUEVfSU5U LCB7Lmk2ND01fSwgICAxLCAgIDUwLCBBRiB9LAorICAgIHsgInMiLCAic2V0IHN1cmdlIHNpemUi LCAgICAgICAgICAgT0ZGU0VUKG5iX3N1cmdlX3NhbXBsZXMpLCBBVl9PUFRfVFlQRV9JTlQsIHsu aTY0PTV9LCAgIDEsICAgNTAsIEFGIH0sCisgICAgeyAibWV0aG9kIiwgInNldCBvdmVybGFwIG1l dGhvZCIsICBPRkZTRVQobWV0aG9kKSwgICAgQVZfT1BUX1RZUEVfSU5ULCAgICB7Lmk2ND0xfSwg ICAgICAgMCwgICAgMSwgQUYsICJtIiB9LAorICAgIHsgIm0iLCAic2V0IG92ZXJsYXAgbWV0aG9k IiwgICAgICAgT0ZGU0VUKG1ldGhvZCksICAgIEFWX09QVF9UWVBFX0lOVCwgICAgey5pNjQ9MX0s ICAgICAgIDAsICAgIDEsIEFGLCAibSIgfSwKKyAgICB7ICJhZGQiLCAib3ZlcmxhcC1hZGQiLCAg ICAgICAgICAgIDAsICAgICAgICAgICAgICAgICBBVl9PUFRfVFlQRV9DT05TVCwgIHsuaTY0PTB9 LCAgICAgICAwLCAgICAwLCBBRiwgIm0iIH0sCisgICAgeyAiYSIsICJvdmVybGFwLWFkZCIsICAg ICAgICAgICAgICAwLCAgICAgICAgICAgICAgICAgQVZfT1BUX1RZUEVfQ09OU1QsICB7Lmk2ND0w fSwgICAgICAgMCwgICAgMCwgQUYsICJtIiB9LAorICAgIHsgInNhdmUiLCAib3ZlcmxhcC1zYXZl IiwgICAgICAgICAgMCwgICAgICAgICAgICAgICAgIEFWX09QVF9UWVBFX0NPTlNULCAgey5pNjQ9 MX0sICAgICAgIDAsICAgIDAsIEFGLCAibSIgfSwKKyAgICB7ICJzIiwgIm92ZXJsYXAtc2F2ZSIs ICAgICAgICAgICAgIDAsICAgICAgICAgICAgICAgICBBVl9PUFRfVFlQRV9DT05TVCwgIHsuaTY0 PTF9LCAgICAgICAwLCAgICAwLCBBRiwgIm0iIH0sCisgICAgeyBOVUxMIH0KK307CisKK0FWRklM VEVSX0RFRklORV9DTEFTUyhhZGVzdXJnZSk7CisKK2NvbnN0IEFWRmlsdGVyIGZmX2FmX2FkZXN1 cmdlID0geworICAgIC5uYW1lICAgICAgICAgID0gImFkZXN1cmdlIiwKKyAgICAuZGVzY3JpcHRp b24gICA9IE5VTExfSUZfQ09ORklHX1NNQUxMKCJSZW1vdmUgc3VyZ2VzIGZyb20gaW5wdXQgYXVk aW8uIiksCisgICAgLnByaXZfc2l6ZSAgICAgPSBzaXplb2YoQXVkaW9EZWNsaWNrQ29udGV4dCks CisgICAgLnByaXZfY2xhc3MgICAgPSAmYWRlc3VyZ2VfY2xhc3MsCisgICAgLmluaXQgICAgICAg ICAgPSBpbml0LAorICAgIC5hY3RpdmF0ZSAgICAgID0gYWN0aXZhdGUsCisgICAgLnVuaW5pdCAg ICAgICAgPSB1bmluaXQsCisgICAgRklMVEVSX0lOUFVUUyhpbnB1dHMpLAorICAgIEZJTFRFUl9P VVRQVVRTKGZmX2F1ZGlvX2RlZmF1bHRfZmlsdGVycGFkKSwKKyAgICBGSUxURVJfU0lOR0xFX1NB TVBMRUZNVChBVl9TQU1QTEVfRk1UX0RCTFApLAorICAgIC5mbGFncyAgICAgICAgID0gQVZGSUxU RVJfRkxBR19TTElDRV9USFJFQURTIHwgQVZGSUxURVJfRkxBR19TVVBQT1JUX1RJTUVMSU5FX0lO VEVSTkFMLAorfTsKZGlmZiAtLWdpdCBhL2xpYmF2ZmlsdGVyL2FsbGZpbHRlcnMuYyBiL2xpYmF2 ZmlsdGVyL2FsbGZpbHRlcnMuYwppbmRleCAwODlhZDNhMGVkLi4yODZlNjAxNzk5IDEwMDY0NAot LS0gYS9saWJhdmZpbHRlci9hbGxmaWx0ZXJzLmMKKysrIGIvbGliYXZmaWx0ZXIvYWxsZmlsdGVy cy5jCkBAIC0zNSw2ICszNSw3IEBAIGV4dGVybiBjb25zdCBBVkZpbHRlciBmZl9hZl9hZGVjb3Jy ZWxhdGU7CiBleHRlcm4gY29uc3QgQVZGaWx0ZXIgZmZfYWZfYWRlbGF5OwogZXh0ZXJuIGNvbnN0 IEFWRmlsdGVyIGZmX2FmX2FkZW5vcm07CiBleHRlcm4gY29uc3QgQVZGaWx0ZXIgZmZfYWZfYWRl cml2YXRpdmU7CitleHRlcm4gY29uc3QgQVZGaWx0ZXIgZmZfYWZfYWRlc3VyZ2U7CiBleHRlcm4g Y29uc3QgQVZGaWx0ZXIgZmZfYWZfYWRyYzsKIGV4dGVybiBjb25zdCBBVkZpbHRlciBmZl9hZl9h ZHluYW1pY2VxdWFsaXplcjsKIGV4dGVybiBjb25zdCBBVkZpbHRlciBmZl9hZl9hZHluYW1pY3Nt b290aDsKLS0gCjIuMzkuMQoK --0000000000003ce0060602842b8c 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". --0000000000003ce0060602842b8c--