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 C809F46434 for ; Thu, 18 May 2023 10:22:55 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B672768C152; Thu, 18 May 2023 13:22:52 +0300 (EEST) Received: from mail-vs1-f46.google.com (mail-vs1-f46.google.com [209.85.217.46]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A3F4668C081 for ; Thu, 18 May 2023 13:22:46 +0300 (EEST) Received: by mail-vs1-f46.google.com with SMTP id ada2fe7eead31-4345365ffe3so536540137.0 for ; Thu, 18 May 2023 03:22:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1684405365; x=1686997365; h=to:subject:message-id:date:from:mime-version:from:to:cc:subject :date:message-id:reply-to; bh=fB7tix2+B8AnYOAzwcuZG7CVMUvKiq2ZvGUocPSFjho=; b=Ca+TIoLqMIU7QZI+uyfi70q87koQo0sKp2sh9bkw66jNExtIvK4uiWj3IRJDkZrP2a 1hbEHZgd5N5eLyWo7DETDl0lSLUQVSQHdTNRuLskTi0CxNghJCQot8nPxRKSez2YgBN6 cpS6MHbZhuiPaNfVholv+HpPDiRl57jIGuKtTO4OCjIAokxS+bu7438xHn18hXmbR1B/ P4jgEpfj8PFh7fnWYg2crr+RunZkkApZk42JoUXtEa4QD12En/7ltDRR/Gr4fYTCKGTy Buqb2wt6DshgD8/arUzy3y+OtnHqn2UPDYB0rBckGvw4ZHUH5peL8M3meHkVBvJdsXCZ +f5A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684405365; x=1686997365; h=to:subject:message-id:date:from:mime-version:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=fB7tix2+B8AnYOAzwcuZG7CVMUvKiq2ZvGUocPSFjho=; b=CvVetHxFQ4oTcYR73qNNmy29nYLZx6m60IRlGDRQmLC4KxpRVNWW23NPQT/0AjkkMf 8rdRyQJzXDTm1TaYE+4ZlofQS/YGXe6ZtP4YBkM1AqL3zrHDYrE7QN10t0JT2904pqgr YdI23a6nMowpSnPApTFekUOpipT5X5+/H3LyNuDr59wpaIvep1B6TtU3zdysud6wPMF/ ahNACVTj6i1CCP/OStH8x7choIZv975LqxG09fG7JRxnaKUzkFpdQrRgaIfnoFfnSAKz vlnWxjm+rGUy0wKiOOA1elE6qhNTw49xBMc+sshvBYpQjO9c92tpofDmGU0b/M2jnXjD A7CA== X-Gm-Message-State: AC+VfDwgVNRBurzvrILd71+Wo974Zs6f/CuOAl2LSqF4Avt7t01sWb2k mlF/QtXD6mKksjLz65LsxFGU+Lps7B9mO2TcasryYTAP X-Google-Smtp-Source: ACHHUZ6l8395H4sea0Ri0+GTvmkrTxmtE1EnIigU7WMF3kfV8aCznEGk+Ude5Zm/jDzdDFmWRNYcukUfFQigVQwdhNo= X-Received: by 2002:a67:e319:0:b0:437:d98c:858 with SMTP id j25-20020a67e319000000b00437d98c0858mr333003vsf.28.1684405365281; Thu, 18 May 2023 03:22:45 -0700 (PDT) MIME-Version: 1.0 From: Paul B Mahol Date: Thu, 18 May 2023 12:22:07 +0200 Message-ID: To: FFmpeg development discussions and patches Content-Type: multipart/mixed; boundary="000000000000753a5005fbf52f6e" X-Content-Filtered-By: Mailman/MimeDel 2.1.29 Subject: [FFmpeg-devel] [PATCH] avfilter/src_movie: activate & dr 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: --000000000000753a5005fbf52f6e Content-Type: text/plain; charset="UTF-8" Attached. --000000000000753a5005fbf52f6e Content-Type: text/x-patch; charset="US-ASCII"; name="0027-avfilter-src_movie-switch-to-activate.patch" Content-Disposition: attachment; filename="0027-avfilter-src_movie-switch-to-activate.patch" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_lhszfeyv0 RnJvbSA3ZWE1ZDk2MjI4ZDI1ZDE4YjU2ZGZlOWZkOTEyOTZlZjFlMjlmYTBhIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBQYXVsIEIgTWFob2wgPG9uZW1kYUBnbWFpbC5jb20+CkRhdGU6 IFRodSwgMTggTWF5IDIwMjMgMDA6NTk6MzEgKzAyMDAKU3ViamVjdDogW1BBVENIIDI3LzI3XSBh dmZpbHRlci9zcmNfbW92aWU6IHN3aXRjaCB0byBhY3RpdmF0ZQoKU2lnbmVkLW9mZi1ieTogUGF1 bCBCIE1haG9sIDxvbmVtZGFAZ21haWwuY29tPgotLS0KIGxpYmF2ZmlsdGVyL3NyY19tb3ZpZS5j IHwgMjY1ICsrKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KIDEgZmlsZSBj aGFuZ2VkLCAxMjIgaW5zZXJ0aW9ucygrKSwgMTQzIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBh L2xpYmF2ZmlsdGVyL3NyY19tb3ZpZS5jIGIvbGliYXZmaWx0ZXIvc3JjX21vdmllLmMKaW5kZXgg YTJlY2M1YTYyNS4uOWJiYzBkOTY5ZSAxMDA2NDQKLS0tIGEvbGliYXZmaWx0ZXIvc3JjX21vdmll LmMKKysrIGIvbGliYXZmaWx0ZXIvc3JjX21vdmllLmMKQEAgLTQ1LDYgKzQ1LDcgQEAKIAogI2lu Y2x1ZGUgImF1ZGlvLmgiCiAjaW5jbHVkZSAiYXZmaWx0ZXIuaCIKKyNpbmNsdWRlICJmaWx0ZXJz LmgiCiAjaW5jbHVkZSAiZm9ybWF0cy5oIgogI2luY2x1ZGUgImludGVybmFsLmgiCiAjaW5jbHVk ZSAidmlkZW8uaCIKQEAgLTU0LDYgKzU1LDggQEAgdHlwZWRlZiBzdHJ1Y3QgTW92aWVTdHJlYW0g ewogICAgIEFWQ29kZWNDb250ZXh0ICpjb2RlY19jdHg7CiAgICAgaW50NjRfdCBkaXNjb250aW51 aXR5X3RocmVzaG9sZDsKICAgICBpbnQ2NF90IGxhc3RfcHRzOworICAgIEFWRnJhbWUgKmZyYW1l OworICAgIGludCBlb2Y7CiB9IE1vdmllU3RyZWFtOwogCiB0eXBlZGVmIHN0cnVjdCBNb3ZpZUNv bnRleHQgewpAQCAtNzAsOCArNzMsMTAgQEAgdHlwZWRlZiBzdHJ1Y3QgTW92aWVDb250ZXh0IHsK ICAgICBpbnQ2NF90IHRzX29mZnNldDsKICAgICBpbnQgZGVjX3RocmVhZHM7CiAKKyAgICBBVlBh Y2tldCAqcGt0OwogICAgIEFWRm9ybWF0Q29udGV4dCAqZm9ybWF0X2N0eDsKIAorICAgIGludCBl b2Y7CiAgICAgaW50IG1heF9zdHJlYW1faW5kZXg7IC8qKjwgbWF4IHN0cmVhbSAjIGFjdHVhbGx5 IHVzZWQgZm9yIG91dHB1dCAqLwogICAgIE1vdmllU3RyZWFtICpzdDsgLyoqPCBhcnJheSBvZiBh bGwgc3RyZWFtcywgb25lIHBlciBvdXRwdXQgKi8KICAgICBpbnQgKm91dF9pbmRleDsgLyoqPCBz dHJlYW0gbnVtYmVyIC0+IG91dHB1dCBudW1iZXIgbWFwLCBvciAtMSAqLwpAQCAtOTksNyArMTA0 LDYgQEAgc3RhdGljIGNvbnN0IEFWT3B0aW9uIG1vdmllX29wdGlvbnNbXT0gewogfTsKIAogc3Rh dGljIGludCBtb3ZpZV9jb25maWdfb3V0cHV0X3Byb3BzKEFWRmlsdGVyTGluayAqb3V0bGluayk7 Ci1zdGF0aWMgaW50IG1vdmllX3JlcXVlc3RfZnJhbWUoQVZGaWx0ZXJMaW5rICpvdXRsaW5rKTsK IAogc3RhdGljIEFWU3RyZWFtICpmaW5kX3N0cmVhbSh2b2lkICpsb2csIEFWRm9ybWF0Q29udGV4 dCAqYXZmLCBjb25zdCBjaGFyICpzcGVjKQogewpAQCAtMzE3LDYgKzMyMSw5IEBAIHN0YXRpYyBh dl9jb2xkIGludCBtb3ZpZV9jb21tb25faW5pdChBVkZpbHRlckNvbnRleHQgKmN0eCkKICAgICBm b3IgKGkgPSAwOyBpIDwgbW92aWUtPmZvcm1hdF9jdHgtPm5iX3N0cmVhbXM7IGkrKykKICAgICAg ICAgbW92aWUtPmZvcm1hdF9jdHgtPnN0cmVhbXNbaV0tPmRpc2NhcmQgPSBBVkRJU0NBUkRfQUxM OwogCisgICAgbW92aWUtPnBrdCA9IGF2X3BhY2tldF9hbGxvYygpOworICAgIGlmICghbW92aWUt PnBrdCkKKyAgICAgICAgcmV0dXJuIEFWRVJST1IoRU5PTUVNKTsKICAgICBtb3ZpZS0+c3QgPSBh dl9jYWxsb2MobmJfc3RyZWFtcywgc2l6ZW9mKCptb3ZpZS0+c3QpKTsKICAgICBpZiAoIW1vdmll LT5zdCkKICAgICAgICAgcmV0dXJuIEFWRVJST1IoRU5PTUVNKTsKQEAgLTMzNCw2ICszNDEsMTAg QEAgc3RhdGljIGF2X2NvbGQgaW50IG1vdmllX2NvbW1vbl9pbml0KEFWRmlsdGVyQ29udGV4dCAq Y3R4KQogICAgICAgICBtb3ZpZS0+bWF4X3N0cmVhbV9pbmRleCA9IEZGTUFYKG1vdmllLT5tYXhf c3RyZWFtX2luZGV4LCBzdC0+aW5kZXgpOwogICAgICAgICBtb3ZpZS0+c3RbaV0uZGlzY29udGlu dWl0eV90aHJlc2hvbGQgPQogICAgICAgICAgICAgYXZfcmVzY2FsZV9xKG1vdmllLT5kaXNjb250 aW51aXR5X3RocmVzaG9sZCwgQVZfVElNRV9CQVNFX1EsIHN0LT50aW1lX2Jhc2UpOworCisgICAg ICAgIG1vdmllLT5zdFtpXS5mcmFtZSA9IGF2X2ZyYW1lX2FsbG9jKCk7CisgICAgICAgIGlmICgh bW92aWUtPnN0W2ldLmZyYW1lKQorICAgICAgICAgICAgcmV0dXJuIEFWRVJST1IoRU5PTUVNKTsK ICAgICB9CiAgICAgaWYgKGF2X3N0cnRvayhOVUxMLCAiKyIsICZjdXJzb3IpKQogICAgICAgICBy ZXR1cm4gQVZFUlJPUl9CVUc7CkBAIC0zNTIsNyArMzYzLDYgQEAgc3RhdGljIGF2X2NvbGQgaW50 IG1vdmllX2NvbW1vbl9pbml0KEFWRmlsdGVyQ29udGV4dCAqY3R4KQogICAgICAgICBpZiAoIXBh ZC5uYW1lKQogICAgICAgICAgICAgcmV0dXJuIEFWRVJST1IoRU5PTUVNKTsKICAgICAgICAgcGFk LmNvbmZpZ19wcm9wcyAgPSBtb3ZpZV9jb25maWdfb3V0cHV0X3Byb3BzOwotICAgICAgICBwYWQu cmVxdWVzdF9mcmFtZSA9IG1vdmllX3JlcXVlc3RfZnJhbWU7CiAgICAgICAgIGlmICgocmV0ID0g ZmZfYXBwZW5kX291dHBhZF9mcmVlX25hbWUoY3R4LCAmcGFkKSkgPCAwKQogICAgICAgICAgICAg cmV0dXJuIHJldDsKICAgICAgICAgaWYgKCBtb3ZpZS0+c3RbaV0uc3QtPmNvZGVjcGFyLT5jb2Rl Y190eXBlID09IEFWTUVESUFfVFlQRV9BVURJTyAmJgpAQCAtMzgxLDcgKzM5MSw5IEBAIHN0YXRp YyBhdl9jb2xkIHZvaWQgbW92aWVfdW5pbml0KEFWRmlsdGVyQ29udGV4dCAqY3R4KQogICAgIGZv ciAoaSA9IDA7IGkgPCBjdHgtPm5iX291dHB1dHM7IGkrKykgewogICAgICAgICBpZiAobW92aWUt PnN0W2ldLnN0KQogICAgICAgICAgICAgYXZjb2RlY19mcmVlX2NvbnRleHQoJm1vdmllLT5zdFtp XS5jb2RlY19jdHgpOworICAgICAgICBhdl9mcmFtZV9mcmVlKCZtb3ZpZS0+c3RbaV0uZnJhbWUp OwogICAgIH0KKyAgICBhdl9wYWNrZXRfZnJlZSgmbW92aWUtPnBrdCk7CiAgICAgYXZfZnJlZXAo Jm1vdmllLT5zdCk7CiAgICAgYXZfZnJlZXAoJm1vdmllLT5vdXRfaW5kZXgpOwogICAgIGlmICht b3ZpZS0+Zm9ybWF0X2N0eCkKQEAgLTQ0NywzMiArNDU5LDYgQEAgc3RhdGljIGludCBtb3ZpZV9j b25maWdfb3V0cHV0X3Byb3BzKEFWRmlsdGVyTGluayAqb3V0bGluaykKICAgICByZXR1cm4gMDsK IH0KIAotc3RhdGljIGNoYXIgKmRlc2NyaWJlX2ZyYW1lX3RvX3N0cihjaGFyICpkc3QsIHNpemVf dCBkc3Rfc2l6ZSwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgQVZGcmFtZSAq ZnJhbWUsIGVudW0gQVZNZWRpYVR5cGUgZnJhbWVfdHlwZSwKLSAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgQVZGaWx0ZXJMaW5rICpsaW5rKQotewotICAgIHN3aXRjaCAoZnJhbWVf dHlwZSkgewotICAgIGNhc2UgQVZNRURJQV9UWVBFX1ZJREVPOgotICAgICAgICBzbnByaW50Zihk c3QsIGRzdF9zaXplLAotICAgICAgICAgICAgICAgICAidmlkZW8gcHRzOiVzIHRpbWU6JXMgc2l6 ZTolZHglZCBhc3BlY3Q6JWQvJWQiLAotICAgICAgICAgICAgICAgICBhdl90czJzdHIoZnJhbWUt PnB0cyksIGF2X3RzMnRpbWVzdHIoZnJhbWUtPnB0cywgJmxpbmstPnRpbWVfYmFzZSksCi0gICAg ICAgICAgICAgICAgIGZyYW1lLT53aWR0aCwgZnJhbWUtPmhlaWdodCwKLSAgICAgICAgICAgICAg ICAgZnJhbWUtPnNhbXBsZV9hc3BlY3RfcmF0aW8ubnVtLAotICAgICAgICAgICAgICAgICBmcmFt ZS0+c2FtcGxlX2FzcGVjdF9yYXRpby5kZW4pOwotICAgICAgICAgICAgICAgICBicmVhazsKLSAg ICBjYXNlIEFWTUVESUFfVFlQRV9BVURJTzoKLSAgICAgICAgc25wcmludGYoZHN0LCBkc3Rfc2l6 ZSwKLSAgICAgICAgICAgICAgICAgImF1ZGlvIHB0czolcyB0aW1lOiVzIHNhbXBsZXM6JWQiLAot ICAgICAgICAgICAgICAgICBhdl90czJzdHIoZnJhbWUtPnB0cyksIGF2X3RzMnRpbWVzdHIoZnJh bWUtPnB0cywgJmxpbmstPnRpbWVfYmFzZSksCi0gICAgICAgICAgICAgICAgIGZyYW1lLT5uYl9z YW1wbGVzKTsKLSAgICAgICAgICAgICAgICAgYnJlYWs7Ci0gICAgZGVmYXVsdDoKLSAgICAgICAg c25wcmludGYoZHN0LCBkc3Rfc2l6ZSwgIiVzIEJVRyIsIGF2X2dldF9tZWRpYV90eXBlX3N0cmlu ZyhmcmFtZV90eXBlKSk7Ci0gICAgICAgIGJyZWFrOwotICAgIH0KLSAgICByZXR1cm4gZHN0Owot fQotCiBzdGF0aWMgaW50IHJld2luZF9maWxlKEFWRmlsdGVyQ29udGV4dCAqY3R4KQogewogICAg IE1vdmllQ29udGV4dCAqbW92aWUgPSBjdHgtPnByaXY7CkBAIC00OTQsMTQ3ICs0ODAsMTM4IEBA IHN0YXRpYyBpbnQgcmV3aW5kX2ZpbGUoQVZGaWx0ZXJDb250ZXh0ICpjdHgpCiAgICAgcmV0dXJu IDA7CiB9CiAKLXN0YXRpYyBpbnQgbW92aWVfZGVjb2RlX3BhY2tldChBVkZpbHRlckNvbnRleHQg KmN0eCkKK3N0YXRpYyBpbnQgZmx1c2hfZGVjb2RlcihBVkZpbHRlckNvbnRleHQgKmN0eCwgaW50 IGkpCiB7CiAgICAgTW92aWVDb250ZXh0ICptb3ZpZSA9IGN0eC0+cHJpdjsKLSAgICBBVlBhY2tl dCBwa3QgPSB7IDAgfTsKLSAgICBpbnQgcGt0X291dF9pZCwgcmV0OwotCi0gICAgLyogcmVhZCBh IG5ldyBwYWNrZXQgZnJvbSBpbnB1dCBzdHJlYW0gKi8KLSAgICByZXQgPSBhdl9yZWFkX2ZyYW1l KG1vdmllLT5mb3JtYXRfY3R4LCAmcGt0KTsKLSAgICBpZiAocmV0ID09IEFWRVJST1JfRU9GKSB7 Ci0gICAgICAgIC8qIEVPRiAtPiBzZXQgYWxsIGRlY29kZXJzIGZvciBmbHVzaGluZyAqLwotICAg ICAgICBmb3IgKGludCBpID0gMDsgaSA8IGN0eC0+bmJfb3V0cHV0czsgaSsrKSB7Ci0gICAgICAg ICAgICByZXQgPSBhdmNvZGVjX3NlbmRfcGFja2V0KG1vdmllLT5zdFtpXS5jb2RlY19jdHgsIE5V TEwpOwotICAgICAgICAgICAgaWYgKHJldCA8IDAgJiYgcmV0ICE9IEFWRVJST1JfRU9GKQotICAg ICAgICAgICAgICAgIHJldHVybiByZXQ7Ci0gICAgICAgIH0KLQotICAgICAgICByZXR1cm4gMDsK LSAgICB9IGVsc2UgaWYgKHJldCA8IDApCi0gICAgICAgIHJldHVybiByZXQ7CisgICAgQVZDb2Rl Y0NvbnRleHQgKmRlYyA9IG1vdmllLT5zdFtpXS5jb2RlY19jdHg7CiAKLSAgICAvKiBzZW5kIHRo ZSBwYWNrZXQgdG8gaXRzIGRlY29kZXIsIGlmIGFueSAqLwotICAgIHBrdF9vdXRfaWQgPSBwa3Qu c3RyZWFtX2luZGV4ID4gbW92aWUtPm1heF9zdHJlYW1faW5kZXggPyAtMSA6Ci0gICAgICAgICAg ICAgICAgIG1vdmllLT5vdXRfaW5kZXhbcGt0LnN0cmVhbV9pbmRleF07Ci0gICAgaWYgKHBrdF9v dXRfaWQgPj0gMCkgewotICAgICAgICBwa3Qub3BhcXVlID0gY3R4LT5vdXRwdXRzW3BrdF9vdXRf aWRdOwotICAgICAgICByZXQgPSBhdmNvZGVjX3NlbmRfcGFja2V0KG1vdmllLT5zdFtwa3Rfb3V0 X2lkXS5jb2RlY19jdHgsICZwa3QpOwotICAgIH0KLSAgICBhdl9wYWNrZXRfdW5yZWYoJnBrdCk7 Ci0KLSAgICByZXR1cm4gcmV0OworICAgIHJldHVybiBhdmNvZGVjX3NlbmRfcGFja2V0KGRlYywg TlVMTCk7CiB9CiAKLS8qKgotICogVHJ5IHRvIHB1c2ggYSBmcmFtZSB0byB0aGUgcmVxdWVzdGVk IG91dHB1dC4KLSAqCi0gKiBAcGFyYW0gY3R4ICAgICBmaWx0ZXIgY29udGV4dAotICogQHBhcmFt IG91dF9pZCAgbnVtYmVyIG9mIG91dHB1dCB3aGVyZSBhIGZyYW1lIGlzIHdhbnRlZDsKLSAqIEBy ZXR1cm4gIDAgaWYgYSBmcmFtZSB3YXMgcHVzaGVkIG9uIHRoZSByZXF1ZXN0ZWQgb3V0cHV0LAot ICogICAgICAgICBBVkVSUk9SKEVBR0FJTikgaWYgdGhlIGRlY29kZXIgcmVxdWlyZXMgbW9yZSBp bnB1dAotICogICAgICAgICBBVkVSUk9SKEVPRikgaWYgdGhlIGRlY29kZXIgaGFzIGJlZW4gY29t cGxldGVseSBmbHVzaGVkCi0gKiAgICAgICAgIDwwIEFWRVJST1IgY29kZQotICovCi1zdGF0aWMg aW50IG1vdmllX3B1c2hfZnJhbWUoQVZGaWx0ZXJDb250ZXh0ICpjdHgsIHVuc2lnbmVkIG91dF9p ZCkKK3N0YXRpYyBpbnQgZGVjb2RlX3BhY2tldChBVkZpbHRlckNvbnRleHQgKmN0eCwgaW50IGkp CiB7Ci0gICAgTW92aWVDb250ZXh0ICAgKm1vdmllID0gY3R4LT5wcml2OwotICAgIE1vdmllU3Ry ZWFtICAgICAgICpzdCA9ICZtb3ZpZS0+c3Rbb3V0X2lkXTsKLSAgICBBVkZpbHRlckxpbmsgKm91 dGxpbmsgPSBjdHgtPm91dHB1dHNbb3V0X2lkXTsKLSAgICBBVkZyYW1lICpmcmFtZTsKLSAgICBp bnQgcmV0OwotCi0gICAgZnJhbWUgPSBhdl9mcmFtZV9hbGxvYygpOwotICAgIGlmICghZnJhbWUp Ci0gICAgICAgIHJldHVybiBBVkVSUk9SKEVOT01FTSk7Ci0KLSAgICByZXQgPSBhdmNvZGVjX3Jl Y2VpdmVfZnJhbWUoc3QtPmNvZGVjX2N0eCwgZnJhbWUpOwotICAgIGlmIChyZXQgPCAwKSB7Ci0g ICAgICAgIGlmIChyZXQgIT0gQVZFUlJPUl9FT0YgJiYgcmV0ICE9IEFWRVJST1IoRUFHQUlOKSkK LSAgICAgICAgICAgIGF2X2xvZyhjdHgsIEFWX0xPR19XQVJOSU5HLCAiRGVjb2RlIGVycm9yOiAl c1xuIiwgYXZfZXJyMnN0cihyZXQpKTsKLQotICAgICAgICBhdl9mcmFtZV9mcmVlKCZmcmFtZSk7 Ci0gICAgICAgIHJldHVybiByZXQ7CisgICAgQVZGaWx0ZXJMaW5rICpvdXRsaW5rID0gY3R4LT5v dXRwdXRzW2ldOworICAgIE1vdmllQ29udGV4dCAqbW92aWUgPSBjdHgtPnByaXY7CisgICAgTW92 aWVTdHJlYW0gKnN0ID0gJm1vdmllLT5zdFtpXTsKKyAgICBBVkNvZGVjQ29udGV4dCAqZGVjID0g bW92aWUtPnN0W2ldLmNvZGVjX2N0eDsKKyAgICBBVkZyYW1lICpmcmFtZSA9IG1vdmllLT5zdFtp XS5mcmFtZTsKKyAgICBBVlBhY2tldCAqcGt0ID0gbW92aWUtPnBrdDsKKyAgICBpbnQgcmV0ID0g MDsKKworICAgIC8vIHN1Ym1pdCB0aGUgcGFja2V0IHRvIHRoZSBkZWNvZGVyCisgICAgaWYgKCFt b3ZpZS0+ZW9mKSB7CisgICAgICAgIHJldCA9IGF2Y29kZWNfc2VuZF9wYWNrZXQoZGVjLCBwa3Qp OworICAgICAgICBpZiAocmV0IDwgMCkKKyAgICAgICAgICAgIHJldHVybiByZXQ7CiAgICAgfQog Ci0gICAgZnJhbWUtPnB0cyA9IGZyYW1lLT5iZXN0X2VmZm9ydF90aW1lc3RhbXA7Ci0gICAgaWYg KGZyYW1lLT5wdHMgIT0gQVZfTk9QVFNfVkFMVUUpIHsKLSAgICAgICAgaWYgKG1vdmllLT50c19v ZmZzZXQpCi0gICAgICAgICAgICBmcmFtZS0+cHRzICs9IGF2X3Jlc2NhbGVfcV9ybmQobW92aWUt PnRzX29mZnNldCwgQVZfVElNRV9CQVNFX1EsIG91dGxpbmstPnRpbWVfYmFzZSwgQVZfUk9VTkRf VVApOwotICAgICAgICBpZiAoc3QtPmRpc2NvbnRpbnVpdHlfdGhyZXNob2xkKSB7Ci0gICAgICAg ICAgICBpZiAoc3QtPmxhc3RfcHRzICE9IEFWX05PUFRTX1ZBTFVFKSB7Ci0gICAgICAgICAgICAg ICAgaW50NjRfdCBkaWZmID0gZnJhbWUtPnB0cyAtIHN0LT5sYXN0X3B0czsKLSAgICAgICAgICAg ICAgICBpZiAoZGlmZiA8IDAgfHwgZGlmZiA+IHN0LT5kaXNjb250aW51aXR5X3RocmVzaG9sZCkg ewotICAgICAgICAgICAgICAgICAgICBhdl9sb2coY3R4LCBBVl9MT0dfVkVSQk9TRSwgIkRpc2Nv bnRpbnVpdHkgaW4gc3RyZWFtOiVkIGRpZmY6JSJQUklkNjQiXG4iLCBvdXRfaWQsIGRpZmYpOwot ICAgICAgICAgICAgICAgICAgICBtb3ZpZS0+dHNfb2Zmc2V0ICs9IGF2X3Jlc2NhbGVfcV9ybmQo LWRpZmYsIG91dGxpbmstPnRpbWVfYmFzZSwgQVZfVElNRV9CQVNFX1EsIEFWX1JPVU5EX1VQKTsK LSAgICAgICAgICAgICAgICAgICAgZnJhbWUtPnB0cyAtPSBkaWZmOworICAgIC8vIGdldCBhbGwg dGhlIGF2YWlsYWJsZSBmcmFtZXMgZnJvbSB0aGUgZGVjb2RlcgorICAgIGlmIChyZXQgPj0gMCkg eworICAgICAgICByZXQgPSBhdmNvZGVjX3JlY2VpdmVfZnJhbWUoZGVjLCBmcmFtZSk7CisgICAg ICAgIGlmIChyZXQgPCAwKSB7CisgICAgICAgICAgICAvLyB0aG9zZSB0d28gcmV0dXJuIHZhbHVl cyBhcmUgc3BlY2lhbCBhbmQgbWVhbiB0aGVyZSBpcyBubyBvdXRwdXQKKyAgICAgICAgICAgIC8v IGZyYW1lIGF2YWlsYWJsZSwgYnV0IHRoZXJlIHdlcmUgbm8gZXJyb3JzIGR1cmluZyBkZWNvZGlu ZworICAgICAgICAgICAgaWYgKHJldCA9PSBBVkVSUk9SX0VPRiB8fCByZXQgPT0gQVZFUlJPUihF QUdBSU4pKQorICAgICAgICAgICAgICAgIHJldHVybiAwOworICAgICAgICAgICAgcmV0dXJuIHJl dDsKKyAgICAgICAgfQorCisgICAgICAgIGZyYW1lLT5wdHMgPSBmcmFtZS0+YmVzdF9lZmZvcnRf dGltZXN0YW1wOworICAgICAgICBpZiAoZnJhbWUtPnB0cyAhPSBBVl9OT1BUU19WQUxVRSkgewor ICAgICAgICAgICAgaWYgKG1vdmllLT50c19vZmZzZXQpCisgICAgICAgICAgICAgICAgZnJhbWUt PnB0cyArPSBhdl9yZXNjYWxlX3Ffcm5kKG1vdmllLT50c19vZmZzZXQsIEFWX1RJTUVfQkFTRV9R LCBvdXRsaW5rLT50aW1lX2Jhc2UsIEFWX1JPVU5EX1VQKTsKKyAgICAgICAgICAgIGlmIChzdC0+ ZGlzY29udGludWl0eV90aHJlc2hvbGQpIHsKKyAgICAgICAgICAgICAgICBpZiAoc3QtPmxhc3Rf cHRzICE9IEFWX05PUFRTX1ZBTFVFKSB7CisgICAgICAgICAgICAgICAgICAgIGludDY0X3QgZGlm ZiA9IGZyYW1lLT5wdHMgLSBzdC0+bGFzdF9wdHM7CisgICAgICAgICAgICAgICAgICAgIGlmIChk aWZmIDwgMCB8fCBkaWZmID4gc3QtPmRpc2NvbnRpbnVpdHlfdGhyZXNob2xkKSB7CisgICAgICAg ICAgICAgICAgICAgICAgICBhdl9sb2coY3R4LCBBVl9MT0dfVkVSQk9TRSwgIkRpc2NvbnRpbnVp dHkgaW4gc3RyZWFtOiVkIGRpZmY6JSJQUklkNjQiXG4iLCBpLCBkaWZmKTsKKyAgICAgICAgICAg ICAgICAgICAgICAgIG1vdmllLT50c19vZmZzZXQgKz0gYXZfcmVzY2FsZV9xX3JuZCgtZGlmZiwg b3V0bGluay0+dGltZV9iYXNlLCBBVl9USU1FX0JBU0VfUSwgQVZfUk9VTkRfVVApOworICAgICAg ICAgICAgICAgICAgICAgICAgZnJhbWUtPnB0cyAtPSBkaWZmOworICAgICAgICAgICAgICAgICAg ICB9CiAgICAgICAgICAgICAgICAgfQogICAgICAgICAgICAgfQorICAgICAgICAgICAgc3QtPmxh c3RfcHRzID0gZnJhbWUtPnB0czsKICAgICAgICAgfQotICAgICAgICBzdC0+bGFzdF9wdHMgPSBm cmFtZS0+cHRzOwotICAgIH0KLSAgICBmZl9kbG9nKGN0eCwgIm1vdmllX3B1c2hfZnJhbWUoKTog ZmlsZTonJXMnICVzXG4iLCBtb3ZpZS0+ZmlsZV9uYW1lLAotICAgICAgICAgICAgZGVzY3JpYmVf ZnJhbWVfdG9fc3RyKChjaGFyWzEwMjRdKXswfSwgMTAyNCwgZnJhbWUsCi0gICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgc3QtPnN0LT5jb2RlY3Bhci0+Y29kZWNfdHlwZSwgb3V0bGlu aykpOwotCi0gICAgaWYgKHN0LT5zdC0+Y29kZWNwYXItPmNvZGVjX3R5cGUgPT0gQVZNRURJQV9U WVBFX1ZJREVPKSB7Ci0gICAgICAgIGlmIChmcmFtZS0+Zm9ybWF0ICE9IG91dGxpbmstPmZvcm1h dCkgewotICAgICAgICAgICAgYXZfbG9nKGN0eCwgQVZfTE9HX0VSUk9SLCAiRm9ybWF0IGNoYW5n ZWQgJXMgLT4gJXMsIGRpc2NhcmRpbmcgZnJhbWVcbiIsCi0gICAgICAgICAgICAgICAgYXZfZ2V0 X3BpeF9mbXRfbmFtZShvdXRsaW5rLT5mb3JtYXQpLAotICAgICAgICAgICAgICAgIGF2X2dldF9w aXhfZm10X25hbWUoZnJhbWUtPmZvcm1hdCkKLSAgICAgICAgICAgICAgICApOwotICAgICAgICAg ICAgYXZfZnJhbWVfZnJlZSgmZnJhbWUpOwotICAgICAgICAgICAgcmV0dXJuIDA7Ci0gICAgICAg IH0KKyAgICAgICAgcmV0ID0gZmZfZmlsdGVyX2ZyYW1lKG91dGxpbmssIGF2X2ZyYW1lX2Nsb25l KGZyYW1lKSk7CisgICAgICAgIGlmIChyZXQgPCAwKQorICAgICAgICAgICAgcmV0dXJuIHJldDsK KyAgICAgICAgaWYgKHJldCA9PSAwKQorICAgICAgICAgICAgcmV0dXJuIDE7CiAgICAgfQotICAg IHJldCA9IGZmX2ZpbHRlcl9mcmFtZShvdXRsaW5rLCBmcmFtZSk7CiAKLSAgICBpZiAocmV0IDwg MCkKLSAgICAgICAgcmV0dXJuIHJldDsKICAgICByZXR1cm4gMDsKIH0KIAotc3RhdGljIGludCBt b3ZpZV9yZXF1ZXN0X2ZyYW1lKEFWRmlsdGVyTGluayAqb3V0bGluaykKK3N0YXRpYyBpbnQgYWN0 aXZhdGUoQVZGaWx0ZXJDb250ZXh0ICpjdHgpCiB7Ci0gICAgQVZGaWx0ZXJDb250ZXh0ICpjdHgg PSBvdXRsaW5rLT5zcmM7Ci0gICAgTW92aWVDb250ZXh0ICAqbW92aWUgPSBjdHgtPnByaXY7Ci0g ICAgdW5zaWduZWQgb3V0X2lkID0gRkZfT1VUTElOS19JRFgob3V0bGluayk7CisgICAgTW92aWVD b250ZXh0ICptb3ZpZSA9IGN0eC0+cHJpdjsKKyAgICBpbnQgd2FudGVkID0gMCwgcmV0OwogCi0g ICAgd2hpbGUgKDEpIHsKLSAgICAgICAgaW50IGdvdF9lYWdhaW4gPSAwLCBnb3RfZW9mID0gMDsK LSAgICAgICAgaW50IHJldCA9IDA7CisgICAgZm9yIChpbnQgaSA9IDA7IGkgPCBjdHgtPm5iX291 dHB1dHM7IGkrKykgeworICAgICAgICBpZiAoZmZfb3V0bGlua19mcmFtZV93YW50ZWQoY3R4LT5v dXRwdXRzW2ldKSkKKyAgICAgICAgICAgIHdhbnRlZCsrOworICAgIH0KIAotICAgICAgICAvKiBj aGVjayBhbGwgZGVjb2RlcnMgZm9yIGF2YWlsYWJsZSBvdXRwdXQgKi8KLSAgICAgICAgZm9yIChp bnQgaSA9IDA7IGkgPCBjdHgtPm5iX291dHB1dHM7IGkrKykgewotICAgICAgICAgICAgcmV0ID0g bW92aWVfcHVzaF9mcmFtZShjdHgsIGkpOwotICAgICAgICAgICAgaWYgKHJldCA9PSBBVkVSUk9S KEVBR0FJTikpCi0gICAgICAgICAgICAgICAgZ290X2VhZ2FpbisrOwotICAgICAgICAgICAgZWxz ZSBpZiAocmV0ID09IEFWRVJST1JfRU9GKQotICAgICAgICAgICAgICAgIGdvdF9lb2YrKzsKLSAg ICAgICAgICAgIGVsc2UgaWYgKHJldCA8IDApCi0gICAgICAgICAgICAgICAgcmV0dXJuIHJldDsK LSAgICAgICAgICAgIGVsc2UgaWYgKGkgPT0gb3V0X2lkKQotICAgICAgICAgICAgICAgIHJldHVy biAwOworICAgIGlmICh3YW50ZWQgPT0gMCkKKyAgICAgICAgcmV0dXJuIEZGRVJST1JfTk9UX1JF QURZOworCisgICAgaWYgKCFtb3ZpZS0+ZW9mKSB7CisgICAgICAgIHJldCA9IGF2X3JlYWRfZnJh bWUobW92aWUtPmZvcm1hdF9jdHgsIG1vdmllLT5wa3QpOworICAgICAgICBpZiAocmV0IDwgMCkg eworICAgICAgICAgICAgbW92aWUtPmVvZiA9IDE7CisgICAgICAgICAgICBmb3IgKGludCBpID0g MDsgaSA8IGN0eC0+bmJfb3V0cHV0czsgaSsrKQorICAgICAgICAgICAgICAgIGZsdXNoX2RlY29k ZXIoY3R4LCBpKTsKKyAgICAgICAgICAgIGZmX2ZpbHRlcl9zZXRfcmVhZHkoY3R4LCAxMDApOwor ICAgICAgICAgICAgcmV0dXJuIDA7CisgICAgICAgIH0gZWxzZSB7CisgICAgICAgICAgICBpbnQg cGt0X291dF9pZCA9IG1vdmllLT5wa3QtPnN0cmVhbV9pbmRleCA+IG1vdmllLT5tYXhfc3RyZWFt X2luZGV4ID8gLTEgOgorICAgICAgICAgICAgICAgICAgICAgICAgICAgICBtb3ZpZS0+b3V0X2lu ZGV4W21vdmllLT5wa3QtPnN0cmVhbV9pbmRleF07CisKKyAgICAgICAgICAgIGlmIChwa3Rfb3V0 X2lkID49IDApIHsKKyAgICAgICAgICAgICAgICBtb3ZpZS0+cGt0LT5vcGFxdWUgPSBjdHgtPm91 dHB1dHNbcGt0X291dF9pZF07CisgICAgICAgICAgICAgICAgcmV0ID0gZGVjb2RlX3BhY2tldChj dHgsIHBrdF9vdXRfaWQpOworICAgICAgICAgICAgfQorICAgICAgICAgICAgYXZfcGFja2V0X3Vu cmVmKG1vdmllLT5wa3QpOworICAgICAgICAgICAgZmZfZmlsdGVyX3NldF9yZWFkeShjdHgsIDEw MCk7CisgICAgICAgICAgICByZXR1cm4gKHJldCA8PSAwKSA/IHJldCA6IDA7CiAgICAgICAgIH0K KyAgICB9IGVsc2UgeworICAgICAgICBpbnQgbmJfZW9mcyA9IDA7CiAKLSAgICAgICAgaWYgKGdv dF9lYWdhaW4pIHsKLSAgICAgICAgICAgIC8qIGFsbCBkZWNvZGVycyByZXF1aXJlIG1vcmUgaW5w dXQgLT4gcmVhZCBhIG5ldyBwYWNrZXQgKi8KLSAgICAgICAgICAgIHJldCA9IG1vdmllX2RlY29k ZV9wYWNrZXQoY3R4KTsKKyAgICAgICAgZm9yIChpbnQgaSA9IDA7IGkgPCBjdHgtPm5iX291dHB1 dHM7IGkrKykgeworICAgICAgICAgICAgaWYgKCFtb3ZpZS0+c3RbaV0uZW9mKSB7CisgICAgICAg ICAgICAgICAgcmV0ID0gZGVjb2RlX3BhY2tldChjdHgsIGkpOworICAgICAgICAgICAgICAgIGlm IChyZXQgPD0gMCkKKyAgICAgICAgICAgICAgICAgICAgbW92aWUtPnN0W2ldLmVvZiA9IDE7Cisg ICAgICAgICAgICB9CisgICAgICAgICAgICBuYl9lb2ZzICs9IG1vdmllLT5zdFtpXS5lb2YgPT0g MTsKKyAgICAgICAgfQorICAgICAgICBpZiAobmJfZW9mcyA9PSBjdHgtPm5iX291dHB1dHMgJiYg bW92aWUtPmxvb3BfY291bnQgIT0gMSkgeworICAgICAgICAgICAgcmV0ID0gcmV3aW5kX2ZpbGUo Y3R4KTsKICAgICAgICAgICAgIGlmIChyZXQgPCAwKQogICAgICAgICAgICAgICAgIHJldHVybiBy ZXQ7Ci0gICAgICAgIH0gZWxzZSBpZiAoZ290X2VvZikgewotICAgICAgICAgICAgLyogYWxsIGRl Y29kZXJzIGZsdXNoZWQgKi8KLSAgICAgICAgICAgIGlmIChtb3ZpZS0+bG9vcF9jb3VudCAhPSAx KSB7Ci0gICAgICAgICAgICAgICAgcmV0ID0gcmV3aW5kX2ZpbGUoY3R4KTsKLSAgICAgICAgICAg ICAgICBpZiAocmV0IDwgMCkKLSAgICAgICAgICAgICAgICAgICAgcmV0dXJuIHJldDsKLSAgICAg ICAgICAgICAgICBtb3ZpZS0+bG9vcF9jb3VudCAtPSBtb3ZpZS0+bG9vcF9jb3VudCA+IDE7Ci0g ICAgICAgICAgICAgICAgYXZfbG9nKGN0eCwgQVZfTE9HX1ZFUkJPU0UsICJTdHJlYW0gZmluaXNo ZWQsIGxvb3BpbmcuXG4iKTsKLSAgICAgICAgICAgICAgICBjb250aW51ZTsKKyAgICAgICAgICAg IG1vdmllLT5sb29wX2NvdW50IC09IG1vdmllLT5sb29wX2NvdW50ID4gMTsKKyAgICAgICAgICAg IGF2X2xvZyhjdHgsIEFWX0xPR19WRVJCT1NFLCAiU3RyZWFtIGZpbmlzaGVkLCBsb29waW5nLlxu Iik7CisgICAgICAgICAgICBmZl9maWx0ZXJfc2V0X3JlYWR5KGN0eCwgMTAwKTsKKyAgICAgICAg ICAgIGZvciAoaW50IGkgPSAwOyBpIDwgY3R4LT5uYl9vdXRwdXRzOyBpKyspCisgICAgICAgICAg ICAgICAgbW92aWUtPnN0W2ldLmVvZiA9IDA7CisgICAgICAgICAgICBtb3ZpZS0+ZW9mID0gMDsK KyAgICAgICAgICAgIHJldHVybiAwOworICAgICAgICB9IGVsc2UgeworICAgICAgICAgICAgZm9y IChpbnQgaSA9IDA7IGkgPCBjdHgtPm5iX291dHB1dHM7IGkrKykgeworICAgICAgICAgICAgICAg IGlmIChtb3ZpZS0+c3RbaV0uZW9mKSB7CisgICAgICAgICAgICAgICAgICAgIGZmX291dGxpbmtf c2V0X3N0YXR1cyhjdHgtPm91dHB1dHNbaV0sIEFWRVJST1JfRU9GLCBtb3ZpZS0+c3RbaV0ubGFz dF9wdHMpOworICAgICAgICAgICAgICAgICAgICBuYl9lb2ZzKys7CisgICAgICAgICAgICAgICAg fQogICAgICAgICAgICAgfQotICAgICAgICAgICAgcmV0dXJuIEFWRVJST1JfRU9GOwogICAgICAg ICB9CisKKyAgICAgICAgaWYgKG5iX2VvZnMgPCBjdHgtPm5iX291dHB1dHMpCisgICAgICAgICAg ICBmZl9maWx0ZXJfc2V0X3JlYWR5KGN0eCwgMTAwKTsKKyAgICAgICAgcmV0dXJuIDA7CiAgICAg fQorCisgICAgcmV0dXJuIEZGRVJST1JfTk9UX1JFQURZOwogfQogCiBzdGF0aWMgaW50IHByb2Nl c3NfY29tbWFuZChBVkZpbHRlckNvbnRleHQgKmN0eCwgY29uc3QgY2hhciAqY21kLCBjb25zdCBj aGFyICphcmdzLApAQCAtNjg5LDYgKzY2Niw3IEBAIGNvbnN0IEFWRmlsdGVyIGZmX2F2c3JjX21v dmllID0gewogICAgIC5wcml2X3NpemUgICAgID0gc2l6ZW9mKE1vdmllQ29udGV4dCksCiAgICAg LnByaXZfY2xhc3MgICAgPSAmbW92aWVfY2xhc3MsCiAgICAgLmluaXQgICAgICAgICAgPSBtb3Zp ZV9jb21tb25faW5pdCwKKyAgICAuYWN0aXZhdGUgICAgICA9IGFjdGl2YXRlLAogICAgIC51bmlu aXQgICAgICAgID0gbW92aWVfdW5pbml0LAogICAgIEZJTFRFUl9RVUVSWV9GVU5DKG1vdmllX3F1 ZXJ5X2Zvcm1hdHMpLAogCkBAIC03MDgsNiArNjg2LDcgQEAgY29uc3QgQVZGaWx0ZXIgZmZfYXZz cmNfYW1vdmllID0gewogICAgIC5wcml2X2NsYXNzICAgID0gJm1vdmllX2NsYXNzLAogICAgIC5w cml2X3NpemUgICAgID0gc2l6ZW9mKE1vdmllQ29udGV4dCksCiAgICAgLmluaXQgICAgICAgICAg PSBtb3ZpZV9jb21tb25faW5pdCwKKyAgICAuYWN0aXZhdGUgICAgICA9IGFjdGl2YXRlLAogICAg IC51bmluaXQgICAgICAgID0gbW92aWVfdW5pbml0LAogICAgIEZJTFRFUl9RVUVSWV9GVU5DKG1v dmllX3F1ZXJ5X2Zvcm1hdHMpLAogCi0tIAoyLjM5LjEKCg== --000000000000753a5005fbf52f6e Content-Type: text/x-patch; charset="US-ASCII"; name="0026-avfilter-src_movie-dr-support.patch" Content-Disposition: attachment; filename="0026-avfilter-src_movie-dr-support.patch" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_lhszff0c1 RnJvbSBhZjczYjY5YTBiZTkwMzNmZGRmMjIyYjZlOWFjNjA3OTlkZTg1NjkxIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBQYXVsIEIgTWFob2wgPG9uZW1kYUBnbWFpbC5jb20+CkRhdGU6 IE1vbiwgMTUgTWF5IDIwMjMgMjE6NTQ6MjUgKzAyMDAKU3ViamVjdDogW1BBVENIIDI2LzI3XSBh dmZpbHRlci9zcmNfbW92aWU6IGRyIHN1cHBvcnQKClNpZ25lZC1vZmYtYnk6IFBhdWwgQiBNYWhv bCA8b25lbWRhQGdtYWlsLmNvbT4KLS0tCiBsaWJhdmZpbHRlci9zcmNfbW92aWUuYyB8IDQ0ICsr KysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKy0tCiAxIGZpbGUgY2hhbmdlZCwg NDIgaW5zZXJ0aW9ucygrKSwgMiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9saWJhdmZpbHRl ci9zcmNfbW92aWUuYyBiL2xpYmF2ZmlsdGVyL3NyY19tb3ZpZS5jCmluZGV4IDU5Mzc2MTNkMTMu LmEyZWNjNWE2MjUgMTAwNjQ0Ci0tLSBhL2xpYmF2ZmlsdGVyL3NyY19tb3ZpZS5jCisrKyBiL2xp YmF2ZmlsdGVyL3NyY19tb3ZpZS5jCkBAIC0yMyw3ICsyMyw2IEBACiAgKiBAZmlsZQogICogbW92 aWUgdmlkZW8gc291cmNlCiAgKgotICogQHRvZG8gdXNlIGRpcmVjdCByZW5kZXJpbmcgKG5vIGFs bG9jYXRpb24gb2YgYSBuZXcgZnJhbWUpCiAgKiBAdG9kbyBzdXBwb3J0IGEgUFRTIGNvcnJlY3Rp b24gbWVjaGFuaXNtCiAgKi8KIApAQCAtMTU2LDYgKzE1NSw0MyBAQCBzdGF0aWMgQVZTdHJlYW0g KmZpbmRfc3RyZWFtKHZvaWQgKmxvZywgQVZGb3JtYXRDb250ZXh0ICphdmYsIGNvbnN0IGNoYXIg KnNwZWMpCiAgICAgcmV0dXJuIGZvdW5kOwogfQogCitzdGF0aWMgaW50IGdldF9idWZmZXIoQVZD b2RlY0NvbnRleHQgKmF2Y3R4LCBBVkZyYW1lICpmcmFtZSwgaW50IGZsYWdzKQoreworICAgIGlu dCBsaW5lc2l6ZV9hbGlnbltBVl9OVU1fREFUQV9QT0lOVEVSU107CisgICAgQVZGaWx0ZXJMaW5r ICpvdXRsaW5rID0gZnJhbWUtPm9wYXF1ZTsKKyAgICBpbnQgdywgaCwgb3csIG9oOworICAgIEFW RnJhbWUgKm5ldzsKKworICAgIGggPSBvaCA9IGZyYW1lLT5oZWlnaHQ7CisgICAgdyA9IG93ID0g ZnJhbWUtPndpZHRoOworCisgICAgaWYgKCEoYXZjdHgtPmNvZGVjLT5jYXBhYmlsaXRpZXMgJiBB Vl9DT0RFQ19DQVBfRFIxKSkKKyAgICAgICAgcmV0dXJuIGF2Y29kZWNfZGVmYXVsdF9nZXRfYnVm ZmVyMihhdmN0eCwgZnJhbWUsIGZsYWdzKTsKKworICAgIHN3aXRjaCAoYXZjdHgtPmNvZGVjX3R5 cGUpIHsKKyAgICBjYXNlIEFWTUVESUFfVFlQRV9WSURFTzoKKyAgICAgICAgYXZjb2RlY19hbGln bl9kaW1lbnNpb25zMihhdmN0eCwgJncsICZoLCBsaW5lc2l6ZV9hbGlnbik7CisgICAgICAgIG5l dyA9IGZmX2RlZmF1bHRfZ2V0X3ZpZGVvX2J1ZmZlcihvdXRsaW5rLCB3LCBoKTsKKyAgICAgICAg YnJlYWs7CisgICAgY2FzZSBBVk1FRElBX1RZUEVfQVVESU86CisgICAgICAgIG5ldyA9IGZmX2Rl ZmF1bHRfZ2V0X2F1ZGlvX2J1ZmZlcihvdXRsaW5rLCBmcmFtZS0+bmJfc2FtcGxlcyk7CisgICAg ICAgIGJyZWFrOworICAgIGRlZmF1bHQ6CisgICAgICAgIHJldHVybiAtMTsKKyAgICB9CisKKyAg ICBhdl9mcmFtZV9jb3B5X3Byb3BzKG5ldywgZnJhbWUpOworICAgIGF2X2ZyYW1lX3VucmVmKGZy YW1lKTsKKyAgICBhdl9mcmFtZV9tb3ZlX3JlZihmcmFtZSwgbmV3KTsKKyAgICBhdl9mcmFtZV9m cmVlKCZuZXcpOworCisgICAgZnJhbWUtPm9wYXF1ZSA9IG91dGxpbms7CisgICAgZnJhbWUtPndp ZHRoICA9IG93OworICAgIGZyYW1lLT5oZWlnaHQgPSBvaDsKKworICAgIHJldHVybiAwOworfQor CiBzdGF0aWMgaW50IG9wZW5fc3RyZWFtKEFWRmlsdGVyQ29udGV4dCAqY3R4LCBNb3ZpZVN0cmVh bSAqc3QsIGludCBkZWNfdGhyZWFkcykKIHsKICAgICBjb25zdCBBVkNvZGVjICpjb2RlYzsKQEAg LTE3MSw2ICsyMDcsOCBAQCBzdGF0aWMgaW50IG9wZW5fc3RyZWFtKEFWRmlsdGVyQ29udGV4dCAq Y3R4LCBNb3ZpZVN0cmVhbSAqc3QsIGludCBkZWNfdGhyZWFkcykKICAgICBpZiAoIXN0LT5jb2Rl Y19jdHgpCiAgICAgICAgIHJldHVybiBBVkVSUk9SKEVOT01FTSk7CiAKKyAgICBzdC0+Y29kZWNf Y3R4LT5mbGFncyB8PSBBVl9DT0RFQ19GTEFHX0NPUFlfT1BBUVVFOworICAgIHN0LT5jb2RlY19j dHgtPmdldF9idWZmZXIyID0gZ2V0X2J1ZmZlcjsKICAgICByZXQgPSBhdmNvZGVjX3BhcmFtZXRl cnNfdG9fY29udGV4dChzdC0+Y29kZWNfY3R4LCBzdC0+c3QtPmNvZGVjcGFyKTsKICAgICBpZiAo cmV0IDwgMCkKICAgICAgICAgcmV0dXJuIHJldDsKQEAgLTQ3OSw4ICs1MTcsMTAgQEAgc3RhdGlj IGludCBtb3ZpZV9kZWNvZGVfcGFja2V0KEFWRmlsdGVyQ29udGV4dCAqY3R4KQogICAgIC8qIHNl bmQgdGhlIHBhY2tldCB0byBpdHMgZGVjb2RlciwgaWYgYW55ICovCiAgICAgcGt0X291dF9pZCA9 IHBrdC5zdHJlYW1faW5kZXggPiBtb3ZpZS0+bWF4X3N0cmVhbV9pbmRleCA/IC0xIDoKICAgICAg ICAgICAgICAgICAgbW92aWUtPm91dF9pbmRleFtwa3Quc3RyZWFtX2luZGV4XTsKLSAgICBpZiAo cGt0X291dF9pZCA+PSAwKQorICAgIGlmIChwa3Rfb3V0X2lkID49IDApIHsKKyAgICAgICAgcGt0 Lm9wYXF1ZSA9IGN0eC0+b3V0cHV0c1twa3Rfb3V0X2lkXTsKICAgICAgICAgcmV0ID0gYXZjb2Rl Y19zZW5kX3BhY2tldChtb3ZpZS0+c3RbcGt0X291dF9pZF0uY29kZWNfY3R4LCAmcGt0KTsKKyAg ICB9CiAgICAgYXZfcGFja2V0X3VucmVmKCZwa3QpOwogCiAgICAgcmV0dXJuIHJldDsKLS0gCjIu MzkuMQoK --000000000000753a5005fbf52f6e 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". --000000000000753a5005fbf52f6e--