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 782DE434FC for ; Tue, 14 Jun 2022 14:43:18 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3E33C68B69C; Tue, 14 Jun 2022 17:43:17 +0300 (EEST) Received: from mail.acc.umu.se (mail.acc.umu.se [130.239.18.156]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 616DB68B67B for ; Tue, 14 Jun 2022 17:43:15 +0300 (EEST) Received: from localhost (localhost.localdomain [127.0.0.1]) by amavisd-new (Postfix) with ESMTP id DB82644DCB for ; Tue, 14 Jun 2022 16:43:14 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=acc.umu.se; s=mail1; t=1655217794; bh=wSUFQnLVZUmuIsT4PlghYZ1GjWFlw9BZXyHXkgMhva4=; h=Subject:From:To:Date:In-Reply-To:References:From; b=AMgLLKuZDZadZ1M/CBrmdhkzUqu7Pv79z4oQHoy6YeuedSmCz75CZpwta1JAxfBR1 zCVgSa+Dp583p3VsBMnvdM6YM2GilwQNGpyO1h2Uus457wkThC+M9a5vIubLslOcvp NGIPVokAxeNdFQppsigJnibD0X8iLHwyUCYYE4Md4jqgt/WawNCMDCrGkq4yI1nt6v sdOnKGlgg8S9uM8WOXOI7r5udbddGbihd+DBpfkg3h9Ff5Y2P9sh0M0Q6ozOzNyXtW Ax8Wa69u2qF3hbT0LgFunpiRXGGUSTFDG/h3mn/sUu70Dgtb2pcD07Zfk8LVf4VAL9 WWauyEp2g/Q4g== Received: from debian.lan (unknown [IPv6:2a00:66c0:a::72c]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: tjoppen) by mail.acc.umu.se (Postfix) with ESMTPSA id 36FF844DC6 for ; Tue, 14 Jun 2022 16:43:14 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=acc.umu.se; s=mail1; t=1655217794; bh=wSUFQnLVZUmuIsT4PlghYZ1GjWFlw9BZXyHXkgMhva4=; h=Subject:From:To:Date:In-Reply-To:References:From; b=AMgLLKuZDZadZ1M/CBrmdhkzUqu7Pv79z4oQHoy6YeuedSmCz75CZpwta1JAxfBR1 zCVgSa+Dp583p3VsBMnvdM6YM2GilwQNGpyO1h2Uus457wkThC+M9a5vIubLslOcvp NGIPVokAxeNdFQppsigJnibD0X8iLHwyUCYYE4Md4jqgt/WawNCMDCrGkq4yI1nt6v sdOnKGlgg8S9uM8WOXOI7r5udbddGbihd+DBpfkg3h9Ff5Y2P9sh0M0Q6ozOzNyXtW Ax8Wa69u2qF3hbT0LgFunpiRXGGUSTFDG/h3mn/sUu70Dgtb2pcD07Zfk8LVf4VAL9 WWauyEp2g/Q4g== Message-ID: <521787bdce69bf8faf7cf1cd8c7470c4f69307ac.camel@acc.umu.se> From: Tomas =?ISO-8859-1?Q?H=E4rdin?= To: FFmpeg development discussions and patches Date: Tue, 14 Jun 2022 16:43:13 +0200 In-Reply-To: <10ec51ef44325c2de6d5de7b994a9b6c8eb5e3a2.camel@acc.umu.se> References: <10ec51ef44325c2de6d5de7b994a9b6c8eb5e3a2.camel@acc.umu.se> Content-Type: multipart/mixed; boundary="=-FqhnGtx1djNahFhA3PA9" User-Agent: Evolution 3.38.3-1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 08/13] lavc/jpeg2000: Switch Jpeg2000TgtNode to int32_t parent 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: --=-FqhnGtx1djNahFhA3PA9 Content-Type: text/plain Content-Transfer-Encoding: 7bit --=-FqhnGtx1djNahFhA3PA9 Content-Disposition: attachment; filename*0=0008-lavc-jpeg2000-Switch-Jpeg2000TgtNode-to-int32_t-pare.pat; filename*1=ch Content-Transfer-Encoding: base64 Content-Type: text/x-patch; name="0008-lavc-jpeg2000-Switch-Jpeg2000TgtNode-to-int32_t-pare.patch"; charset="UTF-8" RnJvbSBjMGUwMGNmMDNmNWExZmNmZmM5MDM5NWQ0YjI2NjA3ZTE2ODE2OTBjIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiA9P1VURi04P3E/VG9tYXM9MjBIPUMzPUE0cmRpbj89IDxnaXRA aGFlcmRpbi5zZT4KRGF0ZTogVHVlLCA3IEp1biAyMDIyIDE2OjQzOjQwICswMjAwClN1YmplY3Q6 IFtQQVRDSCAwOC8xM10gbGF2Yy9qcGVnMjAwMDogU3dpdGNoIEpwZWcyMDAwVGd0Tm9kZSB0byBp bnQzMl90IHBhcmVudAoKLS0tCiBsaWJhdmNvZGVjL2oya2VuYy5jICAgICAgfCA0NCArKysrKysr KysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0tLS0tCiBsaWJhdmNvZGVjL2pwZWcyMDAwLmMg ICAgfCAyMCArKysrKysrKystLS0tLS0tLS0KIGxpYmF2Y29kZWMvanBlZzIwMDAuaCAgICB8ICAy ICstCiBsaWJhdmNvZGVjL2pwZWcyMDAwZGVjLmMgfCAxOCArKysrKysrKy0tLS0tLS0tCiA0IGZp bGVzIGNoYW5nZWQsIDQyIGluc2VydGlvbnMoKyksIDQyIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdp dCBhL2xpYmF2Y29kZWMvajJrZW5jLmMgYi9saWJhdmNvZGVjL2oya2VuYy5jCmluZGV4IDRkZTU5 NmZmYTkuLmEzZDgxNDRhY2MgMTAwNjQ0Ci0tLSBhL2xpYmF2Y29kZWMvajJrZW5jLmMKKysrIGIv bGliYXZjb2RlYy9qMmtlbmMuYwpAQCAtMjQ5LDM2ICsyNDksMzYgQEAgc3RhdGljIHZvaWQgajJr X2ZsdXNoKEpwZWcyMDAwRW5jb2RlckNvbnRleHQgKnMpCiAvKiB0YWcgdHJlZSByb3V0aW5lcyAq LwogCiAvKiogY29kZSB0aGUgdmFsdWUgc3RvcmVkIGluIG5vZGUgKi8KLXN0YXRpYyB2b2lkIHRh Z190cmVlX2NvZGUoSnBlZzIwMDBFbmNvZGVyQ29udGV4dCAqcywgSnBlZzIwMDBUZ3ROb2RlICpu b2RlLCBpbnQgdGhyZXNob2xkKQorc3RhdGljIHZvaWQgdGFnX3RyZWVfY29kZShKcGVnMjAwMEVu Y29kZXJDb250ZXh0ICpzLCBKcGVnMjAwMFRndE5vZGUgKm5vZGVzLCBpbnQzMl90IG5vZGUsIGlu dCB0aHJlc2hvbGQpCiB7Ci0gICAgSnBlZzIwMDBUZ3ROb2RlICpzdGFja1szMF07CisgICAgaW50 MzJfdCBzdGFja1szMF07CiAgICAgaW50IHNwID0gLTEsIGN1cnZhbCA9IDA7CiAKLSAgICB3aGls ZShub2RlLT5wYXJlbnQpeworICAgIHdoaWxlKG5vZGVzW25vZGVdLnBhcmVudCA+PSAwKXsKICAg ICAgICAgc3RhY2tbKytzcF0gPSBub2RlOwotICAgICAgICBub2RlID0gbm9kZS0+cGFyZW50Owor ICAgICAgICBub2RlID0gbm9kZXNbbm9kZV0ucGFyZW50OwogICAgIH0KIAogICAgIHdoaWxlICgx KSB7Ci0gICAgICAgIGlmIChjdXJ2YWwgPiBub2RlLT50ZW1wX3ZhbCkKLSAgICAgICAgICAgIG5v ZGUtPnRlbXBfdmFsID0gY3VydmFsOworICAgICAgICBpZiAoY3VydmFsID4gbm9kZXNbbm9kZV0u dGVtcF92YWwpCisgICAgICAgICAgICBub2Rlc1tub2RlXS50ZW1wX3ZhbCA9IGN1cnZhbDsKICAg ICAgICAgZWxzZSB7Ci0gICAgICAgICAgICBjdXJ2YWwgPSBub2RlLT50ZW1wX3ZhbDsKKyAgICAg ICAgICAgIGN1cnZhbCA9IG5vZGVzW25vZGVdLnRlbXBfdmFsOwogICAgICAgICB9CiAKLSAgICAg ICAgaWYgKG5vZGUtPnZhbCA+PSB0aHJlc2hvbGQpIHsKKyAgICAgICAgaWYgKG5vZGVzW25vZGVd LnZhbCA+PSB0aHJlc2hvbGQpIHsKICAgICAgICAgICAgIHB1dF9iaXRzKHMsIDAsIHRocmVzaG9s ZCAtIGN1cnZhbCk7CiAgICAgICAgICAgICBjdXJ2YWwgPSB0aHJlc2hvbGQ7CiAgICAgICAgIH0g ZWxzZSB7Ci0gICAgICAgICAgICBwdXRfYml0cyhzLCAwLCBub2RlLT52YWwgLSBjdXJ2YWwpOwot ICAgICAgICAgICAgY3VydmFsID0gbm9kZS0+dmFsOwotICAgICAgICAgICAgaWYgKCFub2RlLT52 aXMpIHsKKyAgICAgICAgICAgIHB1dF9iaXRzKHMsIDAsIG5vZGVzW25vZGVdLnZhbCAtIGN1cnZh bCk7CisgICAgICAgICAgICBjdXJ2YWwgPSBub2Rlc1tub2RlXS52YWw7CisgICAgICAgICAgICBp ZiAoIW5vZGVzW25vZGVdLnZpcykgewogICAgICAgICAgICAgICAgIHB1dF9iaXRzKHMsIDEsIDEp OwotICAgICAgICAgICAgICAgIG5vZGUtPnZpcyA9IDE7CisgICAgICAgICAgICAgICAgbm9kZXNb bm9kZV0udmlzID0gMTsKICAgICAgICAgICAgIH0KICAgICAgICAgfQogCi0gICAgICAgIG5vZGUt PnRlbXBfdmFsID0gY3VydmFsOworICAgICAgICBub2Rlc1tub2RlXS50ZW1wX3ZhbCA9IGN1cnZh bDsKICAgICAgICAgaWYgKHNwIDwgMCkKICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICBub2Rl ID0gc3RhY2tbc3AtLV07CkBAIC0yODYsMTQgKzI4NiwxNCBAQCBzdGF0aWMgdm9pZCB0YWdfdHJl ZV9jb2RlKEpwZWcyMDAwRW5jb2RlckNvbnRleHQgKnMsIEpwZWcyMDAwVGd0Tm9kZSAqbm9kZSwg aW50CiB9CiAKIC8qKiB1cGRhdGUgdGhlIHZhbHVlIGluIG5vZGUgKi8KLXN0YXRpYyB2b2lkIHRh Z190cmVlX3VwZGF0ZShKcGVnMjAwMFRndE5vZGUgKm5vZGUpCitzdGF0aWMgdm9pZCB0YWdfdHJl ZV91cGRhdGUoSnBlZzIwMDBUZ3ROb2RlICpub2RlcywgaW50IG5vZGUpCiB7CiAgICAgaW50IGxl diA9IDA7Ci0gICAgd2hpbGUgKG5vZGUtPnBhcmVudCl7Ci0gICAgICAgIGlmIChub2RlLT5wYXJl bnQtPnZhbCA8PSBub2RlLT52YWwpCisgICAgd2hpbGUgKG5vZGVzW25vZGVdLnBhcmVudCA+PSAw KXsKKyAgICAgICAgaWYgKG5vZGVzW25vZGVzW25vZGVdLnBhcmVudF0udmFsIDw9IG5vZGVzW25v ZGVdLnZhbCkKICAgICAgICAgICAgIGJyZWFrOwotICAgICAgICBub2RlLT5wYXJlbnQtPnZhbCA9 IG5vZGUtPnZhbDsKLSAgICAgICAgbm9kZSA9IG5vZGUtPnBhcmVudDsKKyAgICAgICAgbm9kZXNb bm9kZXNbbm9kZV0ucGFyZW50XS52YWwgPSBub2Rlc1tub2RlXS52YWw7CisgICAgICAgIG5vZGUg PSBub2Rlc1tub2RlXS5wYXJlbnQ7CiAgICAgICAgIGxldisrOwogICAgIH0KIH0KQEAgLTgxNCw3 ICs4MTQsNyBAQCBzdGF0aWMgaW50IGVuY29kZV9wYWNrZXQoSnBlZzIwMDBFbmNvZGVyQ29udGV4 dCAqcywgSnBlZzIwMDBSZXNMZXZlbCAqcmxldmVsLCBpbgogICAgICAgICAgICAgICAgICAgICBw cmVjLT56ZXJvYml0c1twb3NdLnZhbCA9IGV4cG5bYmFuZG5vXSArIG51bWdiaXRzIC0gMSAtIGNi bGstPm5vbnplcm9iaXRzOwogICAgICAgICAgICAgICAgICAgICBjYmxrLT5pbmNsID0gMDsKICAg ICAgICAgICAgICAgICAgICAgY2Jsay0+bGJsb2NrID0gMzsKLSAgICAgICAgICAgICAgICAgICAg dGFnX3RyZWVfdXBkYXRlKHByZWMtPnplcm9iaXRzICsgcG9zKTsKKyAgICAgICAgICAgICAgICAg ICAgdGFnX3RyZWVfdXBkYXRlKHByZWMtPnplcm9iaXRzLCBwb3MpOwogICAgICAgICAgICAgICAg ICAgICBmb3IgKGkgPSAwOyBpIDwgbmxheWVyczsgaSsrKSB7CiAgICAgICAgICAgICAgICAgICAg ICAgICBpZiAoY2Jsay0+bGF5ZXJzW2ldLm5wYXNzZXMgPiAwKSB7CiAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgcHJlYy0+Y2Jsa2luY2xbcG9zXS52YWwgPSBpOwpAQCAtODIzLDcgKzgyMyw3 IEBAIHN0YXRpYyBpbnQgZW5jb2RlX3BhY2tldChKcGVnMjAwMEVuY29kZXJDb250ZXh0ICpzLCBK cGVnMjAwMFJlc0xldmVsICpybGV2ZWwsIGluCiAgICAgICAgICAgICAgICAgICAgIH0KICAgICAg ICAgICAgICAgICAgICAgaWYgKGkgPT0gbmxheWVycykKICAgICAgICAgICAgICAgICAgICAgICAg IHByZWMtPmNibGtpbmNsW3Bvc10udmFsID0gaTsKLSAgICAgICAgICAgICAgICAgICAgdGFnX3Ry ZWVfdXBkYXRlKHByZWMtPmNibGtpbmNsICsgcG9zKTsKKyAgICAgICAgICAgICAgICAgICAgdGFn X3RyZWVfdXBkYXRlKHByZWMtPmNibGtpbmNsLCBwb3MpOwogICAgICAgICAgICAgICAgIH0KICAg ICAgICAgICAgIH0KICAgICAgICAgfQpAQCAtODc3LDcgKzg3Nyw3IEBAIHN0YXRpYyBpbnQgZW5j b2RlX3BhY2tldChKcGVnMjAwMEVuY29kZXJDb250ZXh0ICpzLCBKcGVnMjAwMFJlc0xldmVsICpy bGV2ZWwsIGluCiAKICAgICAgICAgICAgICAgICAvLyBpbmNsdXNpb24gaW5mb3JtYXRpb24KICAg ICAgICAgICAgICAgICBpZiAoIWNibGstPmluY2wpCi0gICAgICAgICAgICAgICAgICAgIHRhZ190 cmVlX2NvZGUocywgcHJlYy0+Y2Jsa2luY2wgKyBwb3MsIGxheW5vICsgMSk7CisgICAgICAgICAg ICAgICAgICAgIHRhZ190cmVlX2NvZGUocywgcHJlYy0+Y2Jsa2luY2wsIHBvcywgbGF5bm8gKyAx KTsKICAgICAgICAgICAgICAgICBlbHNlIHsKICAgICAgICAgICAgICAgICAgICAgcHV0X2JpdHMo cywgY2Jsay0+bGF5ZXJzW2xheW5vXS5ucGFzc2VzID4gMCwgMSk7CiAgICAgICAgICAgICAgICAg fQpAQCAtODg3LDcgKzg4Nyw3IEBAIHN0YXRpYyBpbnQgZW5jb2RlX3BhY2tldChKcGVnMjAwMEVu Y29kZXJDb250ZXh0ICpzLCBKcGVnMjAwMFJlc0xldmVsICpybGV2ZWwsIGluCiAKICAgICAgICAg ICAgICAgICAvLyB6ZXJvYml0cyBpbmZvcm1hdGlvbgogICAgICAgICAgICAgICAgIGlmICghY2Js ay0+aW5jbCkgewotICAgICAgICAgICAgICAgICAgICB0YWdfdHJlZV9jb2RlKHMsIHByZWMtPnpl cm9iaXRzICsgcG9zLCAxMDApOworICAgICAgICAgICAgICAgICAgICB0YWdfdHJlZV9jb2RlKHMs IHByZWMtPnplcm9iaXRzLCBwb3MsIDEwMCk7CiAgICAgICAgICAgICAgICAgICAgIGNibGstPmlu Y2wgPSAxOwogICAgICAgICAgICAgICAgIH0KIApkaWZmIC0tZ2l0IGEvbGliYXZjb2RlYy9qcGVn MjAwMC5jIGIvbGliYXZjb2RlYy9qcGVnMjAwMC5jCmluZGV4IDdlYzU5ODY4NzUuLjBiZWMyZTE4 N2QgMTAwNjQ0Ci0tLSBhL2xpYmF2Y29kZWMvanBlZzIwMDAuYworKysgYi9saWJhdmNvZGVjL2pw ZWcyMDAwLmMKQEAgLTU1LDggKzU1LDggQEAgc3RhdGljIGludDMyX3QgdGFnX3RyZWVfc2l6ZShp bnQgdywgaW50IGgpCiBzdGF0aWMgaW50IGZmX2pwZWcyMDAwX3RhZ190cmVlX2luaXQoSnBlZzIw MDBUZ3ROb2RlICoqb2xkLCB1bnNpZ25lZCBpbnQgKnNpemUsIGludCB3LCBpbnQgaCkKIHsKICAg ICBpbnQgcHcgPSB3LCBwaCA9IGg7Ci0gICAgSnBlZzIwMDBUZ3ROb2RlICp0LCAqdDI7Ci0gICAg aW50MzJfdCB0dF9zaXplOworICAgIEpwZWcyMDAwVGd0Tm9kZSAqdDsKKyAgICBpbnQzMl90IHR0 X3NpemUsIG9mcyA9IDA7CiAgICAgc2l6ZV90IHByb2Q7CiAKICAgICB0dF9zaXplID0gdGFnX3Ry ZWVfc2l6ZSh3LCBoKTsKQEAgLTc3LDE1ICs3NywxNSBAQCBzdGF0aWMgaW50IGZmX2pwZWcyMDAw X3RhZ190cmVlX2luaXQoSnBlZzIwMDBUZ3ROb2RlICoqb2xkLCB1bnNpZ25lZCBpbnQgKnNpemUs CiAKICAgICAgICAgdyAgPSAodyArIDEpID4+IDE7CiAgICAgICAgIGggID0gKGggKyAxKSA+PiAx OwotICAgICAgICB0MiA9IHQgKyBwdyAqIHBoOworICAgICAgICBvZnMgKz0gcHcgKiBwaDsKIAog ICAgICAgICBmb3IgKGkgPSAwOyBpIDwgcGg7IGkrKykKICAgICAgICAgICAgIGZvciAoaiA9IDA7 IGogPCBwdzsgaisrKQotICAgICAgICAgICAgICAgIHRbaSAqIHB3ICsgal0ucGFyZW50ID0gJnQy WyhpID4+IDEpICogdyArIChqID4+IDEpXTsKKyAgICAgICAgICAgICAgICB0W2kgKiBwdyArIGpd LnBhcmVudCA9IChpID4+IDEpICogdyArIChqID4+IDEpICsgb2ZzOwogCi0gICAgICAgIHQgPSB0 MjsKKyAgICAgICAgdCArPSBwdyAqIHBoOwogICAgIH0KLSAgICB0WzBdLnBhcmVudCA9IE5VTEw7 CisgICAgdFswXS5wYXJlbnQgPSAtMTsKICAgICByZXR1cm4gMDsKIH0KIApAQCAtMzIwLDYgKzMy MCwxMCBAQCBzdGF0aWMgaW50IGluaXRfcHJlYyhBVkNvZGVjQ29udGV4dCAqYXZjdHgsCiAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIGJhbmQtPmxvZzJfY2Jsa19oZWlnaHQpCiAgICAg ICAgIC0gKHByZWMtPmNvb3JkWzFdWzBdID4+IGJhbmQtPmxvZzJfY2Jsa19oZWlnaHQpOwogCisg ICAgLyogXHN1bV97aT0wfV5caW5mIDReLWkgPSA0LzMgKi8KKyAgICBpZiAocHJlYy0+bmJfY29k ZWJsb2Nrc193aWR0aCAqICh1aW50NjRfdClwcmVjLT5uYl9jb2RlYmxvY2tzX2hlaWdodCA+IElO VDMyX01BWCAvIDQgKiAzKSB7CisgICAgICAgIHJldHVybiBBVkVSUk9SKEVOT01FTSk7CisgICAg fQogCiAgICAgLyogVGFnIHRyZWVzIGluaXRpYWxpemF0aW9uICovCiAgICAgaWYgKGZmX2pwZWcy MDAwX3RhZ190cmVlX2luaXQoJnByZWMtPmNibGtpbmNsLApAQCAtMzMyLDEwICszMzYsNiBAQCBz dGF0aWMgaW50IGluaXRfcHJlYyhBVkNvZGVjQ29udGV4dCAqYXZjdHgsCiAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgcHJlYy0+bmJfY29kZWJsb2Nrc19oZWlnaHQpKQogICAgICAg ICByZXR1cm4gQVZFUlJPUihFTk9NRU0pOwogCi0gICAgaWYgKHByZWMtPm5iX2NvZGVibG9ja3Nf d2lkdGggKiAodWludDY0X3QpcHJlYy0+bmJfY29kZWJsb2Nrc19oZWlnaHQgPiBJTlRfTUFYKSB7 Ci0gICAgICAgIHByZWMtPmNibGsgPSBOVUxMOwotICAgICAgICByZXR1cm4gQVZFUlJPUihFTk9N RU0pOwotICAgIH0KICAgICBuYl9jb2RlYmxvY2tzID0gcHJlYy0+bmJfY29kZWJsb2Nrc193aWR0 aCAqIHByZWMtPm5iX2NvZGVibG9ja3NfaGVpZ2h0OwogICAgIGlmIChmZl9mYXN0X3JlY2FsbG9j KCZwcmVjLT5jYmxrLCAmcHJlYy0+Y2Jsa19zaXplLCBuYl9jb2RlYmxvY2tzLCBzaXplb2YoKnBy ZWMtPmNibGspKSkKICAgICAgICAgcmV0dXJuIEFWRVJST1IoRU5PTUVNKTsKZGlmZiAtLWdpdCBh L2xpYmF2Y29kZWMvanBlZzIwMDAuaCBiL2xpYmF2Y29kZWMvanBlZzIwMDAuaAppbmRleCAzYmY4 NWE2NjY5Li4xZmQ5ZDE5M2U3IDEwMDY0NAotLS0gYS9saWJhdmNvZGVjL2pwZWcyMDAwLmgKKysr IGIvbGliYXZjb2RlYy9qcGVnMjAwMC5oCkBAIC0xMjYsMTAgKzEyNiwxMCBAQCB0eXBlZGVmIHN0 cnVjdCBKcGVnMjAwMFQxQ29udGV4dCB7CiB9IEpwZWcyMDAwVDFDb250ZXh0OwogCiB0eXBlZGVm IHN0cnVjdCBKcGVnMjAwMFRndE5vZGUgeworICAgIGludDMyX3QgcGFyZW50OwogICAgIHVpbnQ4 X3QgdmFsOwogICAgIHVpbnQ4X3QgdGVtcF92YWw7CiAgICAgdWludDhfdCB2aXM7Ci0gICAgc3Ry dWN0IEpwZWcyMDAwVGd0Tm9kZSAqcGFyZW50OwogfSBKcGVnMjAwMFRndE5vZGU7CiAKIHR5cGVk ZWYgc3RydWN0IEpwZWcyMDAwQ29kaW5nU3R5bGUgewpkaWZmIC0tZ2l0IGEvbGliYXZjb2RlYy9q cGVnMjAwMGRlYy5jIGIvbGliYXZjb2RlYy9qcGVnMjAwMGRlYy5jCmluZGV4IGEzZmMwNWVhOTcu LmEyYjlmMDE2NmIgMTAwNjQ0Ci0tLSBhL2xpYmF2Y29kZWMvanBlZzIwMDBkZWMuYworKysgYi9s aWJhdmNvZGVjL2pwZWcyMDAwZGVjLmMKQEAgLTE4NSwyNCArMTg1LDI0IEBAIHN0YXRpYyB2b2lk IGpwZWcyMDAwX2ZsdXNoKEpwZWcyMDAwRGVjb2RlckNvbnRleHQgKnMpCiB9CiAKIC8qIGRlY29k ZSB0aGUgdmFsdWUgc3RvcmVkIGluIG5vZGUgKi8KLXN0YXRpYyBpbnQgdGFnX3RyZWVfZGVjb2Rl KEpwZWcyMDAwRGVjb2RlckNvbnRleHQgKnMsIEpwZWcyMDAwVGd0Tm9kZSAqbm9kZSwKK3N0YXRp YyBpbnQgdGFnX3RyZWVfZGVjb2RlKEpwZWcyMDAwRGVjb2RlckNvbnRleHQgKnMsIEpwZWcyMDAw VGd0Tm9kZSAqbm9kZXMsIGludDMyX3Qgbm9kZSwKICAgICAgICAgICAgICAgICAgICAgICAgICAg IGludCB0aHJlc2hvbGQpCiB7CiAgICAgSnBlZzIwMDBUZ3ROb2RlICpzdGFja1szMF07CiAgICAg aW50IHNwID0gLTEsIGN1cnZhbCA9IDA7CiAKLSAgICBpZiAoIW5vZGUpIHsKKyAgICBpZiAobm9k ZSA8IDApIHsKICAgICAgICAgYXZfbG9nKHMtPmF2Y3R4LCBBVl9MT0dfRVJST1IsICJtaXNzaW5n IG5vZGVcbiIpOwogICAgICAgICByZXR1cm4gQVZFUlJPUl9JTlZBTElEREFUQTsKICAgICB9CiAK LSAgICB3aGlsZSAobm9kZSAmJiAhbm9kZS0+dmlzKSB7Ci0gICAgICAgIHN0YWNrWysrc3BdID0g bm9kZTsKLSAgICAgICAgbm9kZSAgICAgICAgPSBub2RlLT5wYXJlbnQ7CisgICAgd2hpbGUgKG5v ZGUgPj0gMCAmJiAhbm9kZXNbbm9kZV0udmlzKSB7CisgICAgICAgIHN0YWNrWysrc3BdID0gJm5v ZGVzW25vZGVdOworICAgICAgICBub2RlICAgICAgICA9IG5vZGVzW25vZGVdLnBhcmVudDsKICAg ICB9CiAKLSAgICBpZiAobm9kZSkKLSAgICAgICAgY3VydmFsID0gbm9kZS0+dmFsOworICAgIGlm IChub2RlID49IDApCisgICAgICAgIGN1cnZhbCA9IG5vZGVzW25vZGVdLnZhbDsKICAgICBlbHNl CiAgICAgICAgIGN1cnZhbCA9IHN0YWNrW3NwXS0+dmFsOwogCkBAIC0xMTYxLDcgKzExNjEsNyBA QCBzdGF0aWMgaW50IGpwZWcyMDAwX2RlY29kZV9wYWNrZXQoSnBlZzIwMDBEZWNvZGVyQ29udGV4 dCAqcywgSnBlZzIwMDBUaWxlICp0aWxlLAogICAgICAgICAgICAgaWYgKGNibGstPm5wYXNzZXMp CiAgICAgICAgICAgICAgICAgaW5jbCA9IGdldF9iaXRzKHMsIDEpOwogICAgICAgICAgICAgZWxz ZQotICAgICAgICAgICAgICAgIGluY2wgPSB0YWdfdHJlZV9kZWNvZGUocywgcHJlYy0+Y2Jsa2lu Y2wgKyBjYmxrbm8sIGxheW5vICsgMSkgPT0gbGF5bm87CisgICAgICAgICAgICAgICAgaW5jbCA9 IHRhZ190cmVlX2RlY29kZShzLCBwcmVjLT5jYmxraW5jbCwgY2Jsa25vLCBsYXlubyArIDEpID09 IGxheW5vOwogICAgICAgICAgICAgaWYgKCFpbmNsKQogICAgICAgICAgICAgICAgIGNvbnRpbnVl OwogICAgICAgICAgICAgZWxzZSBpZiAoaW5jbCA8IDApCkBAIC0xMTY5LDcgKzExNjksNyBAQCBz dGF0aWMgaW50IGpwZWcyMDAwX2RlY29kZV9wYWNrZXQoSnBlZzIwMDBEZWNvZGVyQ29udGV4dCAq cywgSnBlZzIwMDBUaWxlICp0aWxlLAogCiAgICAgICAgICAgICBpZiAoIWNibGstPm5wYXNzZXMp IHsKICAgICAgICAgICAgICAgICBpbnQgdiA9IGV4cG5bYmFuZG5vXSArIG51bWdiaXRzIC0gMSAt Ci0gICAgICAgICAgICAgICAgICAgICAgICB0YWdfdHJlZV9kZWNvZGUocywgcHJlYy0+emVyb2Jp dHMgKyBjYmxrbm8sIDEwMCk7CisgICAgICAgICAgICAgICAgICAgICAgICB0YWdfdHJlZV9kZWNv ZGUocywgcHJlYy0+emVyb2JpdHMsIGNibGtubywgMTAwKTsKICAgICAgICAgICAgICAgICBpZiAo diA8IDAgfHwgdiA+IDMwKSB7CiAgICAgICAgICAgICAgICAgICAgIGF2X2xvZyhzLT5hdmN0eCwg QVZfTE9HX0VSUk9SLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgIm5vbnplcm9iaXRzICVk IGludmFsaWQgb3IgdW5zdXBwb3J0ZWRcbiIsIHYpOwotLSAKMi4zMC4yCgo= --=-FqhnGtx1djNahFhA3PA9 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". --=-FqhnGtx1djNahFhA3PA9--