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 E159140BF7 for ; Sat, 9 Apr 2022 13:36:12 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D5FED68B2E4; Sat, 9 Apr 2022 16:36:10 +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 0B5F768B026 for ; Sat, 9 Apr 2022 16:36:05 +0300 (EEST) Received: from localhost (localhost.localdomain [127.0.0.1]) by amavisd-new (Postfix) with ESMTP id 82B6A44B90 for ; Sat, 9 Apr 2022 15:36:04 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=acc.umu.se; s=mail1; t=1649511364; bh=soc3eKKHZfWapB+keRx0IeyCrLxjFrUQIi08WfL6Bw8=; h=Subject:From:To:Date:In-Reply-To:References:From; b=WThH0z7mHoLQBmhe26cbm026Vsz4nbAw/1UlBectkpFRfi5JJ6/81QerE0JG94y+Y cFZDQuThe2qq/44eDTPotQd0zuifinUhoQp2vG0EUe4YAxT4iYN9cwVHGUAh9+qjWI it03wvLSOOgv2qtljysUm+MgvsSN5mK91nt9ZVz47PEM+YKYxYlsU1Ep65lJwkYR+c Q+ugZgv+PG0Vx5xkMb66LRp/ZWsPeu/xxYmakdT22rjAQwPXbn5hUU+uXAt2UsAy2D 2/tK+T3CaPLqMVBw++gq2D4iDNIccH86vIZapIj4xLdAT6vrhqv7gxVG6VYxn+UPqb 4CRrICzGXV39Q== Received: from [192.168.1.244] (213-67-66-101-no2430.tbcn.telia.com [213.67.66.101]) (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 7F53E44B8F for ; Sat, 9 Apr 2022 15:36:03 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=acc.umu.se; s=mail1; t=1649511363; bh=soc3eKKHZfWapB+keRx0IeyCrLxjFrUQIi08WfL6Bw8=; h=Subject:From:To:Date:In-Reply-To:References:From; b=yrBrxc43ooKqT5Eb4lWXp8NBx/u5PVEfg+lgOEBbVhY6+uYXKL3IkyGpX+bnIehnd QUtFy2L5XPfmMqJKgM1lx6Eo0QZ85hsl7/hP+CIz9lt36RGHMHQW/zefZHthLBmn5F 4ldSNPXpG2AMeVIUaVq/I/b4cqnR0MCDk8L6/NE4YAvpcDUXKE0I0436Y2JwHMnBBc 6jciR7r4pWYasp79OySBT1YU3Kh+Flws/ny0xeM9tGP/JVfnwb734ZtZg7MNNS0c/8 Tj4kUoFeRvvwj8S8ryFNdsP6Ewf3sq3yOTTYTvNRzR5B7EK0psn7MCMcDfKfST5CoP An7BjyYqXTvAA== Message-ID: From: Tomas =?ISO-8859-1?Q?H=E4rdin?= To: FFmpeg development discussions and patches Date: Sat, 09 Apr 2022 15:36:02 +0200 In-Reply-To: References: Content-Type: multipart/mixed; boundary="=-U+GzPNixkA+d3QLg/TFl" User-Agent: Evolution 3.38.3-1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/3] libavcodec/cinepakenc: Mark no-skip frames as keyframes 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: --=-U+GzPNixkA+d3QLg/TFl Content-Type: text/plain Content-Transfer-Encoding: 7bit --=-U+GzPNixkA+d3QLg/TFl Content-Disposition: attachment; filename*0=0002-libavcodec-cinepakenc-Mark-no-skip-frames-as-keyfram.pat; filename*1=ch Content-Transfer-Encoding: base64 Content-Type: text/x-patch; name="0002-libavcodec-cinepakenc-Mark-no-skip-frames-as-keyfram.patch"; charset="UTF-8" RnJvbSA0NDJiZjBmYmJhNGUxM2FhN2QwNWZmNWMzMGIwN2Q0Yzk0YTgxODJjIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiA9P1VURi04P3E/VG9tYXM9MjBIPUMzPUE0cmRpbj89IDxnaXRA aGFlcmRpbi5zZT4KRGF0ZTogU2F0LCA5IEFwciAyMDIyIDE0OjM4OjQ3ICswMjAwClN1YmplY3Q6 IFtQQVRDSCAyLzNdIGxpYmF2Y29kZWMvY2luZXBha2VuYzogTWFyayBuby1za2lwIGZyYW1lcyBh cyBrZXlmcmFtZXMKClJlc2V0IGN1cmZyYW1lIHdoZW5ldmVyIHdlIGdlbmVyYXRlIGEga2V5ZnJh bWUuClVzZSAtZyBpbnN0ZWFkIG9mIC1rZXlpbnRfbWluLgotLS0KIGxpYmF2Y29kZWMvY2luZXBh a2VuYy5jICAgICAgICAgICAgICB8IDUwICsrKysrKysrKysrKysrKysrKystLS0tLS0tLS0KIHRl c3RzL3JlZi92c3ludGgvdnN5bnRoMS1jaW5lcGFrICAgICB8ICA4ICsrLS0tCiB0ZXN0cy9yZWYv dnN5bnRoL3ZzeW50aDItY2luZXBhayAgICAgfCAgOCArKy0tLQogdGVzdHMvcmVmL3ZzeW50aC92 c3ludGhfbGVuYS1jaW5lcGFrIHwgIDYgKystLQogNCBmaWxlcyBjaGFuZ2VkLCA0NiBpbnNlcnRp b25zKCspLCAyNiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9saWJhdmNvZGVjL2NpbmVwYWtl bmMuYyBiL2xpYmF2Y29kZWMvY2luZXBha2VuYy5jCmluZGV4IDhiMzJjMDI3ODAuLjZjZmU4ZGUy MDAgMTAwNjQ0Ci0tLSBhL2xpYmF2Y29kZWMvY2luZXBha2VuYy5jCisrKyBiL2xpYmF2Y29kZWMv Y2luZXBha2VuYy5jCkBAIC0xMTMsNyArMTEzLDcgQEAgdHlwZWRlZiBzdHJ1Y3QgQ2luZXBha0Vu Y0NvbnRleHQgewogICAgIGVudW0gQVZQaXhlbEZvcm1hdCBwaXhfZm10OwogICAgIGludCB3LCBo OwogICAgIGludCBmcmFtZV9idWZfc2l6ZTsKLSAgICBpbnQgY3VyZnJhbWUsIGtleWludDsKKyAg ICBpbnQgY3VyZnJhbWU7CiAgICAgQVZMRkcgcmFuZGN0eDsKICAgICB1aW50NjRfdCBsYW1iZGE7 CiAgICAgaW50ICpjb2RlYm9va19pbnB1dDsKQEAgLTIxNSw3ICsyMTUsNiBAQCBzdGF0aWMgYXZf Y29sZCBpbnQgY2luZXBha19lbmNvZGVfaW5pdChBVkNvZGVjQ29udGV4dCAqYXZjdHgpCiAgICAg cy0+aCAgICAgICAgICAgICAgPSBhdmN0eC0+aGVpZ2h0OwogICAgIHMtPmZyYW1lX2J1Zl9zaXpl ID0gZnJhbWVfYnVmX3NpemU7CiAgICAgcy0+Y3VyZnJhbWUgICAgICAgPSAwOwotICAgIHMtPmtl eWludCAgICAgICAgID0gYXZjdHgtPmtleWludF9taW47CiAgICAgcy0+cGl4X2ZtdCAgICAgICAg PSBhdmN0eC0+cGl4X2ZtdDsKIAogICAgIC8vIHNldCB1cCBBVkZyYW1lcwpAQCAtODM1LDggKzgz NCw3IEBAIHN0YXRpYyB2b2lkIGNhbGN1bGF0ZV9za2lwX2Vycm9ycyhDaW5lcGFrRW5jQ29udGV4 dCAqcywgaW50IGgsCiAgICAgICAgIH0KIH0KIAotc3RhdGljIHZvaWQgd3JpdGVfc3RyaXBfaGVh ZGVyKENpbmVwYWtFbmNDb250ZXh0ICpzLCBpbnQgeSwgaW50IGgsIGludCBrZXlmcmFtZSwKLSAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICB1bnNpZ25lZCBjaGFyICpidWYsIGludCBzdHJp cF9zaXplKQorc3RhdGljIHZvaWQgd3JpdGVfc3RyaXBfa2V5ZnJhbWUodW5zaWduZWQgY2hhciAq YnVmLCBpbnQga2V5ZnJhbWUpCiB7CiAgICAgLy8gYWN0dWFsbHkgd2UgYXJlIGV4Y2x1c2l2ZWx5 IHVzaW5nIGludHJhIHN0cmlwIGNvZGluZyAoaG93IG11Y2ggY2FuIHdlIHdpbgogICAgIC8vIG90 aGVyd2lzZT8gaG93IHRvIGNob29zZSB3aGljaCBwYXJ0IG9mIGEgY29kZWJvb2sgdG8gdXBkYXRl PyksCkBAIC04NDQsNiArODQyLDEyIEBAIHN0YXRpYyB2b2lkIHdyaXRlX3N0cmlwX2hlYWRlcihD aW5lcGFrRW5jQ29udGV4dCAqcywgaW50IHksIGludCBoLCBpbnQga2V5ZnJhbWUsCiAgICAgLy8g KGJlc2lkZXMsIHRoZSBsb2dpYyBoZXJlIHVzZWQgdG8gYmUgaW52ZXJ0ZWQ6ICkKICAgICAvLyAg ICBidWZbMF0gPSBrZXlmcmFtZSA/IDB4MTE6IDB4MTA7CiAgICAgYnVmWzBdID0ga2V5ZnJhbWUg PyAweDEwIDogMHgxMTsKK30KKworc3RhdGljIHZvaWQgd3JpdGVfc3RyaXBfaGVhZGVyKENpbmVw YWtFbmNDb250ZXh0ICpzLCBpbnQgeSwgaW50IGgsIGludCBrZXlmcmFtZSwKKyAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICB1bnNpZ25lZCBjaGFyICpidWYsIGludCBzdHJpcF9zaXplKQor eworICAgIHdyaXRlX3N0cmlwX2tleWZyYW1lKGJ1Ziwga2V5ZnJhbWUpOwogICAgIEFWX1dCMjQo JmJ1ZlsxXSwgc3RyaXBfc2l6ZSArIFNUUklQX0hFQURFUl9TSVpFKTsKICAgICAvLyBBVl9XQjE2 KCZidWZbNF0sIHkpOyAvKiB1c2luZyBhYnNvbHV0ZSB5IHZhbHVlcyB3b3JrcyAtLSBybCAqLwog ICAgIEFWX1dCMTYoJmJ1Zls0XSwgMCk7IC8qIHVzaW5nIHJlbGF0aXZlIHZhbHVlcyB3b3JrcyBh cyB3ZWxsIC0tIHJsICovCkBAIC04NTcsNyArODYxLDcgQEAgc3RhdGljIGludCByZF9zdHJpcChD aW5lcGFrRW5jQ29udGV4dCAqcywgaW50IHksIGludCBoLCBpbnQga2V5ZnJhbWUsCiAgICAgICAg ICAgICAgICAgICAgIHVpbnQ4X3QgKmxhc3RfZGF0YVs0XSwgaW50IGxhc3RfbGluZXNpemVbNF0s CiAgICAgICAgICAgICAgICAgICAgIHVpbnQ4X3QgKmRhdGFbNF0sIGludCBsaW5lc2l6ZVs0XSwK ICAgICAgICAgICAgICAgICAgICAgdWludDhfdCAqc2NyYXRjaF9kYXRhWzRdLCBpbnQgc2NyYXRj aF9saW5lc2l6ZVs0XSwKLSAgICAgICAgICAgICAgICAgICAgdW5zaWduZWQgY2hhciAqYnVmLCBp bnQ2NF90ICpiZXN0X3Njb3JlKQorICAgICAgICAgICAgICAgICAgICB1bnNpZ25lZCBjaGFyICpi dWYsIGludDY0X3QgKmJlc3Rfc2NvcmUsIGludCAqbm9fc2tpcCkKIHsKICAgICBpbnQ2NF90IHNj b3JlID0gMDsKICAgICBpbnQgYmVzdF9zaXplID0gMDsKQEAgLTk3Myw2ICs5NzcsOSBAQCBzdGF0 aWMgaW50IHJkX3N0cmlwKENpbmVwYWtFbmNDb250ZXh0ICpzLCBpbnQgeSwgaW50IGgsIGludCBr ZXlmcmFtZSwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgc2Ny YXRjaF9kYXRhLCBzY3JhdGNoX2xpbmVzaXplLAogICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICBsYXN0X2RhdGEsIGxhc3RfbGluZXNpemUsICZpbmZvLAogICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBzLT5zdHJpcF9idWYgKyBTVFJJ UF9IRUFERVJfU0laRSk7CisgICAgICAgICAgICAgICAgICAgIC8vIGluIHRoZW9yeSB3ZSBjb3Vs ZCBoYXZlIE1PREVfTUMgd2l0aG91dCBFTkNfU0tJUCwKKyAgICAgICAgICAgICAgICAgICAgLy8g YnV0IE1PREVfVjFfVjQgd2lsbCBhbHdheXMgYmUgbW9yZSBlZmZpY2llbnQKKyAgICAgICAgICAg ICAgICAgICAgKm5vX3NraXAgPSBpbmZvLm1vZGUgIT0gTU9ERV9NQzsKIAogICAgICAgICAgICAg ICAgICAgICB3cml0ZV9zdHJpcF9oZWFkZXIocywgeSwgaCwga2V5ZnJhbWUsIHMtPnN0cmlwX2J1 ZiwgYmVzdF9zaXplKTsKICAgICAgICAgICAgICAgICB9CkBAIC05OTksMTMgKzEwMDYsMTMgQEAg c3RhdGljIGludCB3cml0ZV9jdmlkX2hlYWRlcihDaW5lcGFrRW5jQ29udGV4dCAqcywgdW5zaWdu ZWQgY2hhciAqYnVmLAogfQogCiBzdGF0aWMgaW50IHJkX2ZyYW1lKENpbmVwYWtFbmNDb250ZXh0 ICpzLCBjb25zdCBBVkZyYW1lICpmcmFtZSwKLSAgICAgICAgICAgICAgICAgICAgaW50IGlzYWtl eWZyYW1lLCB1bnNpZ25lZCBjaGFyICpidWYsIGludCBidWZfc2l6ZSkKKyAgICAgICAgICAgICAg ICAgICAgaW50IGlzYWtleWZyYW1lLCB1bnNpZ25lZCBjaGFyICpidWYsIGludCBidWZfc2l6ZSwg aW50ICpnb3Rfa2V5ZnJhbWUpCiB7CiAgICAgaW50IG51bV9zdHJpcHMsIHN0cmlwLCBpLCB5LCBu ZXh0eSwgc2l6ZSwgdGVtcF9zaXplLCBiZXN0X3NpemU7CiAgICAgdWludDhfdCAqbGFzdF9kYXRh ICAgIFs0XSwgKmRhdGEgICAgWzRdLCAqc2NyYXRjaF9kYXRhICAgIFs0XTsKICAgICBpbnQgICAg ICBsYXN0X2xpbmVzaXplWzRdLCAgbGluZXNpemVbNF0sICBzY3JhdGNoX2xpbmVzaXplWzRdOwog ICAgIGludDY0X3QgYmVzdF9zY29yZSA9IDAsIHNjb3JlLCBzY29yZV90ZW1wOwotICAgIGludCBi ZXN0X25zdHJpcHM7CisgICAgaW50IGJlc3RfbnN0cmlwcywgYmVzdF9zdHJpcF9vZmZzZXRzW01B WF9TVFJJUFNdOwogCiAgICAgaWYgKHMtPnBpeF9mbXQgPT0gQVZfUElYX0ZNVF9SR0IyNCkgewog ICAgICAgICBpbnQgeDsKQEAgLTEwNjQsMTIgKzEwNzEsMTUgQEAgc3RhdGljIGludCByZF9mcmFt ZShDaW5lcGFrRW5jQ29udGV4dCAqcywgY29uc3QgQVZGcmFtZSAqZnJhbWUsCiAgICAgLy8gd291 bGQgYmUgbmljZSBidXQgcXVpdGUgY2VydGFpbmx5IGluY29tcGF0aWJsZSB3aXRoIHZpbnRhZ2Ug cGxheWVyczoKICAgICAvLyBzdXBwb3J0IGVuY29kaW5nIHplcm8gc3RyaXBzIChtZWFuaW5nIHNr aXAgdGhlIHdob2xlIGZyYW1lKQogICAgIGZvciAobnVtX3N0cmlwcyA9IHMtPm1pbl9zdHJpcHM7 IG51bV9zdHJpcHMgPD0gcy0+bWF4X3N0cmlwcyAmJiBudW1fc3RyaXBzIDw9IHMtPmggLyBNQl9T SVpFOyBudW1fc3RyaXBzKyspIHsKKyAgICAgICAgaW50IHN0cmlwX29mZnNldHNbTUFYX1NUUklQ U107CisgICAgICAgIGludCBhbGxfbm9fc2tpcCA9IDE7CiAgICAgICAgIHNjb3JlID0gMDsKICAg ICAgICAgc2l6ZSAgPSAwOwogCiAgICAgICAgIGZvciAoeSA9IDAsIHN0cmlwID0gMTsgeSA8IHMt Pmg7IHN0cmlwKyssIHkgPSBuZXh0eSkgewotICAgICAgICAgICAgaW50IHN0cmlwX2hlaWdodDsK KyAgICAgICAgICAgIGludCBzdHJpcF9oZWlnaHQsIG5vX3NraXA7CiAKKyAgICAgICAgICAgIHN0 cmlwX29mZnNldHNbc3RyaXAtMV0gPSBzaXplICsgQ1ZJRF9IRUFERVJfU0laRTsKICAgICAgICAg ICAgIG5leHR5ID0gc3RyaXAgKiBzLT5oIC8gbnVtX3N0cmlwczsgLy8gPD0gcy0+aAogICAgICAg ICAgICAgLy8gbWFrZSBuZXh0eSB0aGUgbmV4dCBtdWx0aXBsZSBvZiA0IGlmIG5vdCBhbHJlYWR5 IHRoZXJlCiAgICAgICAgICAgICBpZiAobmV4dHkgJiAzKQpAQCAtMTA5OSwyMSArMTEwOSwyNCBA QCBzdGF0aWMgaW50IHJkX2ZyYW1lKENpbmVwYWtFbmNDb250ZXh0ICpzLCBjb25zdCBBVkZyYW1l ICpmcmFtZSwKICAgICAgICAgICAgIGlmICgodGVtcF9zaXplID0gcmRfc3RyaXAocywgeSwgc3Ry aXBfaGVpZ2h0LCBpc2FrZXlmcmFtZSwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgbGFzdF9kYXRhLCBsYXN0X2xpbmVzaXplLCBkYXRhLCBsaW5lc2l6ZSwKICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgc2NyYXRjaF9kYXRhLCBzY3JhdGNoX2xpbmVz aXplLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBzLT5mcmFtZV9idWYg KyBzaXplICsgQ1ZJRF9IRUFERVJfU0laRSwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgJnNjb3JlX3RlbXApKSA8IDApCisgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIHMtPmZyYW1lX2J1ZiArIHN0cmlwX29mZnNldHNbc3RyaXAtMV0sCisgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICZzY29yZV90ZW1wLCAmbm9fc2tpcCkpIDwg MCkKICAgICAgICAgICAgICAgICByZXR1cm4gdGVtcF9zaXplOwogCiAgICAgICAgICAgICBzY29y ZSArPSBzY29yZV90ZW1wOwogICAgICAgICAgICAgc2l6ZSArPSB0ZW1wX3NpemU7CisgICAgICAg ICAgICBhbGxfbm9fc2tpcCAmPSBub19za2lwOwogICAgICAgICB9CiAKICAgICAgICAgaWYgKGJl c3Rfc2NvcmUgPT0gMCB8fCBzY29yZSA8IGJlc3Rfc2NvcmUpIHsKICAgICAgICAgICAgIGJlc3Rf c2NvcmUgPSBzY29yZTsKLSAgICAgICAgICAgIGJlc3Rfc2l6ZSA9IHNpemUgKyB3cml0ZV9jdmlk X2hlYWRlcihzLCBzLT5mcmFtZV9idWYsIG51bV9zdHJpcHMsIHNpemUsIGlzYWtleWZyYW1lKTsK KyAgICAgICAgICAgIGJlc3Rfc2l6ZSA9IHNpemUgKyB3cml0ZV9jdmlkX2hlYWRlcihzLCBzLT5m cmFtZV9idWYsIG51bV9zdHJpcHMsIHNpemUsIGFsbF9ub19za2lwKTsKIAogICAgICAgICAgICAg RkZTV0FQKEFWRnJhbWUgKiwgcy0+YmVzdF9mcmFtZSwgcy0+c2NyYXRjaF9mcmFtZSk7CiAgICAg ICAgICAgICBtZW1jcHkoYnVmLCBzLT5mcmFtZV9idWYsIGJlc3Rfc2l6ZSk7CiAgICAgICAgICAg ICBiZXN0X25zdHJpcHMgPSBudW1fc3RyaXBzOworICAgICAgICAgICAgKmdvdF9rZXlmcmFtZSA9 IGFsbF9ub19za2lwOyAvLyBubyBza2lwIE1CcyBpbiBhbnkgc3RyaXAgLT4ga2V5ZnJhbWUKKyAg ICAgICAgICAgIG1lbWNweShiZXN0X3N0cmlwX29mZnNldHMsIHN0cmlwX29mZnNldHMsIHNpemVv ZihzdHJpcF9vZmZzZXRzKSk7CiAgICAgICAgIH0KICAgICAgICAgLy8gYXZvaWQgdHJ5aW5nIHRv byBtYW55IHN0cmlwIG51bWJlcnMgd2l0aG91dCBhIHJlYWwgcmVhc29uCiAgICAgICAgIC8vICh0 aGlzIG1ha2VzIHRoZSBwcm9jZXNzaW5nIG9mIHRoZSB2ZXJ5IGZpcnN0IGZyYW1lIGZhc3RlcikK QEAgLTExMjEsNiArMTEzNCwxMSBAQCBzdGF0aWMgaW50IHJkX2ZyYW1lKENpbmVwYWtFbmNDb250 ZXh0ICpzLCBjb25zdCBBVkZyYW1lICpmcmFtZSwKICAgICAgICAgICAgIGJyZWFrOwogICAgIH0K IAorICAgIC8vIHVwZGF0ZSBzdHJpcCBoZWFkZXJzCisgICAgZm9yIChpID0gMDsgaSA8IGJlc3Rf bnN0cmlwczsgaSsrKSB7CisgICAgICAgIHdyaXRlX3N0cmlwX2tleWZyYW1lKHMtPmZyYW1lX2J1 ZiArIGJlc3Rfc3RyaXBfb2Zmc2V0c1tpXSwgKmdvdF9rZXlmcmFtZSk7CisgICAgfQorCiAgICAg Ly8gbGV0IHRoZSBudW1iZXIgb2Ygc3RyaXBzIHNsb3dseSBhZGFwdCB0byB0aGUgY2hhbmdlcyBp biB0aGUgY29udGVudHMsCiAgICAgLy8gY29tcGFyZWQgdG8gZnVsbCBicnV0ZWZvcmNpbmcgZXZl cnkgdGltZSB0aGlzIHdpbGwgb2NjYXNpb25hbGx5IGxlYWQKICAgICAvLyB0byBzb21lIHIvZCBw ZXJmb3JtYW5jZSBsb3NzIGJ1dCBtYWtlcyBlbmNvZGluZyB1cCB0byBzZXZlcmFsIHRpbWVzIGZh c3RlcgpAQCAtMTE1MSwyMSArMTE2OSwyMyBAQCBzdGF0aWMgaW50IGNpbmVwYWtfZW5jb2RlX2Zy YW1lKEFWQ29kZWNDb250ZXh0ICphdmN0eCwgQVZQYWNrZXQgKnBrdCwKICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgY29uc3QgQVZGcmFtZSAqZnJhbWUsIGludCAqZ290X3BhY2tldCkK IHsKICAgICBDaW5lcGFrRW5jQ29udGV4dCAqcyA9IGF2Y3R4LT5wcml2X2RhdGE7Ci0gICAgaW50 IHJldDsKKyAgICBpbnQgcmV0LCBnb3Rfa2V5ZnJhbWU7CiAKICAgICBzLT5sYW1iZGEgPSBmcmFt ZS0+cXVhbGl0eSA/IGZyYW1lLT5xdWFsaXR5IC0gMSA6IDIgKiBGRl9MQU1CREFfU0NBTEU7CiAK ICAgICBpZiAoKHJldCA9IGZmX2FsbG9jX3BhY2tldChhdmN0eCwgcGt0LCBzLT5mcmFtZV9idWZf c2l6ZSkpIDwgMCkKICAgICAgICAgcmV0dXJuIHJldDsKLSAgICByZXQgICAgICAgPSByZF9mcmFt ZShzLCBmcmFtZSwgKHMtPmN1cmZyYW1lID09IDApLCBwa3QtPmRhdGEsIHMtPmZyYW1lX2J1Zl9z aXplKTsKKyAgICByZXQgICAgICAgPSByZF9mcmFtZShzLCBmcmFtZSwgKHMtPmN1cmZyYW1lID09 IDApLCBwa3QtPmRhdGEsIHMtPmZyYW1lX2J1Zl9zaXplLCAmZ290X2tleWZyYW1lKTsKICAgICBw a3QtPnNpemUgPSByZXQ7Ci0gICAgaWYgKHMtPmN1cmZyYW1lID09IDApCisgICAgaWYgKGdvdF9r ZXlmcmFtZSkgewogICAgICAgICBwa3QtPmZsYWdzIHw9IEFWX1BLVF9GTEFHX0tFWTsKKyAgICAg ICAgcy0+Y3VyZnJhbWUgPSAwOworICAgIH0KICAgICAqZ290X3BhY2tldCA9IDE7CiAKICAgICBG RlNXQVAoQVZGcmFtZSAqLCBzLT5sYXN0X2ZyYW1lLCBzLT5iZXN0X2ZyYW1lKTsKIAotICAgIGlm ICgrK3MtPmN1cmZyYW1lID49IHMtPmtleWludCkKKyAgICBpZiAoKytzLT5jdXJmcmFtZSA+PSBh dmN0eC0+Z29wX3NpemUpCiAgICAgICAgIHMtPmN1cmZyYW1lID0gMDsKIAogICAgIHJldHVybiAw OwpkaWZmIC0tZ2l0IGEvdGVzdHMvcmVmL3ZzeW50aC92c3ludGgxLWNpbmVwYWsgYi90ZXN0cy9y ZWYvdnN5bnRoL3ZzeW50aDEtY2luZXBhawppbmRleCBlNDdhZTI2YjZkLi43Y2IzMzIyMGU3IDEw MDY0NAotLS0gYS90ZXN0cy9yZWYvdnN5bnRoL3ZzeW50aDEtY2luZXBhaworKysgYi90ZXN0cy9y ZWYvdnN5bnRoL3ZzeW50aDEtY2luZXBhawpAQCAtMSw0ICsxLDQgQEAKLWNkMjhlNDdhNmFjMzk2 MjQwYTNmZWU2OWYxNTYyNWQxICp0ZXN0cy9kYXRhL2ZhdGUvdnN5bnRoMS1jaW5lcGFrLmF2aQot NDA4NjE2IHRlc3RzL2RhdGEvZmF0ZS92c3ludGgxLWNpbmVwYWsuYXZpCi1lNzQwNjZhMDI4Yzcw OGY0NjcyNzI4ODRlY2QzZjdkMyAqdGVzdHMvZGF0YS9mYXRlL3ZzeW50aDEtY2luZXBhay5vdXQu cmF3dmlkZW8KLXN0ZGRldjogICA2MS4zOCBQU05SOiAxMi4zNyBNQVhESUZGOiAgMjI1IGJ5dGVz OiAgNzYwMzIwMC8gICA5MjE2MDAKKzZiOWI0ZDJiMzI4NTRmZDhiMGY4NGVlNGQ3NmIxZmVkICp0 ZXN0cy9kYXRhL2ZhdGUvdnN5bnRoMS1jaW5lcGFrLmF2aQorNDA4OTEwIHRlc3RzL2RhdGEvZmF0 ZS92c3ludGgxLWNpbmVwYWsuYXZpCis0YWNkY2MzZTY2NGQxMmZhY2JjZWZjMzg5MDc5Y2ZhNiAq dGVzdHMvZGF0YS9mYXRlL3ZzeW50aDEtY2luZXBhay5vdXQucmF3dmlkZW8KK3N0ZGRldjogICA2 MS4zOCBQU05SOiAxMi4zNyBNQVhESUZGOiAgMjIzIGJ5dGVzOiAgNzYwMzIwMC8gICA5MjE2MDAK ZGlmZiAtLWdpdCBhL3Rlc3RzL3JlZi92c3ludGgvdnN5bnRoMi1jaW5lcGFrIGIvdGVzdHMvcmVm L3ZzeW50aC92c3ludGgyLWNpbmVwYWsKaW5kZXggODM1ZGU3OGQxNi4uNzJiODc5NDExNiAxMDA2 NDQKLS0tIGEvdGVzdHMvcmVmL3ZzeW50aC92c3ludGgyLWNpbmVwYWsKKysrIGIvdGVzdHMvcmVm L3ZzeW50aC92c3ludGgyLWNpbmVwYWsKQEAgLTEsNCArMSw0IEBACi02NjNhMjgwNGY0MjE3MDky MDhjNzZmNmUzNGU3YmVhNSAqdGVzdHMvZGF0YS9mYXRlL3ZzeW50aDItY2luZXBhay5hdmkKLTQw MDQwMiB0ZXN0cy9kYXRhL2ZhdGUvdnN5bnRoMi1jaW5lcGFrLmF2aQotMmM3NjFjM2M4Y2RhMDgz ZWI4ZjU0YjJkZjcyYjI1N2IgKnRlc3RzL2RhdGEvZmF0ZS92c3ludGgyLWNpbmVwYWsub3V0LnJh d3ZpZGVvCi1zdGRkZXY6ICAgODAuOTYgUFNOUjogIDkuOTYgTUFYRElGRjogIDIyNyBieXRlczog IDc2MDMyMDAvICAgOTIxNjAwCis2NzVkNmE0MzcwYzMxNWRjNTNjMjE5YTkyNzFiZTRjNiAqdGVz dHMvZGF0YS9mYXRlL3ZzeW50aDItY2luZXBhay5hdmkKKzQwMDcyMCB0ZXN0cy9kYXRhL2ZhdGUv dnN5bnRoMi1jaW5lcGFrLmF2aQorY2JmNjkwMGI4ODJiNDg0YmM1MzFmOWI0Nzk5YzIyNmUgKnRl c3RzL2RhdGEvZmF0ZS92c3ludGgyLWNpbmVwYWsub3V0LnJhd3ZpZGVvCitzdGRkZXY6ICAgODAu OTYgUFNOUjogIDkuOTYgTUFYRElGRjogIDIyOSBieXRlczogIDc2MDMyMDAvICAgOTIxNjAwCmRp ZmYgLS1naXQgYS90ZXN0cy9yZWYvdnN5bnRoL3ZzeW50aF9sZW5hLWNpbmVwYWsgYi90ZXN0cy9y ZWYvdnN5bnRoL3ZzeW50aF9sZW5hLWNpbmVwYWsKaW5kZXggNmIwMjE2NzNhMC4uYzljYjJjZmFi YSAxMDA2NDQKLS0tIGEvdGVzdHMvcmVmL3ZzeW50aC92c3ludGhfbGVuYS1jaW5lcGFrCisrKyBi L3Rlc3RzL3JlZi92c3ludGgvdnN5bnRoX2xlbmEtY2luZXBhawpAQCAtMSw0ICsxLDQgQEAKLWE5 ZWExOWViMGQyMzlhNTNhZjg2MzBkNWJjNDE2N2QwICp0ZXN0cy9kYXRhL2ZhdGUvdnN5bnRoX2xl bmEtY2luZXBhay5hdmkKLTQwNzU3NCB0ZXN0cy9kYXRhL2ZhdGUvdnN5bnRoX2xlbmEtY2luZXBh ay5hdmkKLWUzMmQ0MTAzMTk0NjY1ZDJlYTBmNDZkNWNkZDBjZGYyICp0ZXN0cy9kYXRhL2ZhdGUv dnN5bnRoX2xlbmEtY2luZXBhay5vdXQucmF3dmlkZW8KK2E3OWY5MDdmZWNiOTVjOGE1YjVkZTY3 MGNjZGEyMTViICp0ZXN0cy9kYXRhL2ZhdGUvdnN5bnRoX2xlbmEtY2luZXBhay5hdmkKKzQwNzk1 MiB0ZXN0cy9kYXRhL2ZhdGUvdnN5bnRoX2xlbmEtY2luZXBhay5hdmkKKzI2NjRjZGZmNWYxNDUw OGU4OTE0NzdiNDk4Y2M4NDBlICp0ZXN0cy9kYXRhL2ZhdGUvdnN5bnRoX2xlbmEtY2luZXBhay5v dXQucmF3dmlkZW8KIHN0ZGRldjogICA1OC4xMCBQU05SOiAxMi44NSBNQVhESUZGOiAgMTg1IGJ5 dGVzOiAgNzYwMzIwMC8gICA5MjE2MDAKLS0gCjIuMzAuMgoK --=-U+GzPNixkA+d3QLg/TFl 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". --=-U+GzPNixkA+d3QLg/TFl--