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 39B7E476EB for ; Sun, 19 Nov 2023 19:09:03 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id EE79468C805; Sun, 19 Nov 2023 21:09:00 +0200 (EET) Received: from mail-4324.protonmail.ch (mail-4324.protonmail.ch [185.70.43.24]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EDD4568AA4B for ; Sun, 19 Nov 2023 21:08:53 +0200 (EET) Date: Sun, 19 Nov 2023 19:08:45 +0000 To: FFmpeg development discussions and patches Message-ID: Feedback-ID: 28710920:user:proton MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="b1_4Qnv6SsKk4tCoFKjNGyES1gX8UIOCI7ftQS5NUmtsw" Subject: [FFmpeg-devel] [PATCH v6 1/2] avformat/flac_picture: Add ff_flac_write_picture 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: , From: =?utf-8?q?Zsolt_Vad=C3=A1sz_via_ffmpeg-devel?= Reply-To: FFmpeg development discussions and patches Cc: =?utf-8?Q?Zsolt_Vad=C3=A1sz?= Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: This is a multi-part message in MIME format. --b1_4Qnv6SsKk4tCoFKjNGyES1gX8UIOCI7ftQS5NUmtsw Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Attached. --b1_4Qnv6SsKk4tCoFKjNGyES1gX8UIOCI7ftQS5NUmtsw Content-Type: text/x-patch; name=v6-0001-avformat-flac_picture-Add-ff_flac_write_picture.patch Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename=v6-0001-avformat-flac_picture-Add-ff_flac_write_picture.patch RnJvbSAxYjdhNTEwZmY1NzIwZDIxODY4ZjAyODRjN2E1MDQ4OTAzNGJlZTdkIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiA9P1VURi04P3E/WnNvbHQ9MjBWYWQ9QzM9QTFzej89IDx6c29s dF92YWRhc3pAcHJvdG9ubWFpbC5jb20+CkRhdGU6IEZyaSwgMTAgTWFyIDIwMjMgMTE6MjM6MTMg KzAwMDAKU3ViamVjdDogW1BBVENIIHY2IDEvMl0gYXZmb3JtYXQvZmxhY19waWN0dXJlOiBBZGQg ZmZfZmxhY193cml0ZV9waWN0dXJlCgpUaGlzIGZ1bmN0aW9uIGlzIGFibGUgdG8gd3JpdGUgY292 ZXIgYXJ0IGludG8gYm90aCBGTEFDIGFuZCBPZ2cgZmlsZXMKClNpZ25lZC1vZmYtYnk6IFpzb2x0 IFZhZGFzeiA8enNvbHRfdmFkYXN6QHByb3Rvbm1haWwuY29tPgotLS0KIGxpYmF2Zm9ybWF0L2Zs YWNfcGljdHVyZS5jIHwgMTMyICsrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysK IGxpYmF2Zm9ybWF0L2ZsYWNfcGljdHVyZS5oIHwgICA1ICsrCiBsaWJhdmZvcm1hdC9mbGFjZW5j LmMgICAgICB8ICA5MCArLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiAzIGZpbGVzIGNoYW5nZWQs IDE0MCBpbnNlcnRpb25zKCspLCA4NyBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9saWJhdmZv cm1hdC9mbGFjX3BpY3R1cmUuYyBiL2xpYmF2Zm9ybWF0L2ZsYWNfcGljdHVyZS5jCmluZGV4IGIz M2ZlZTc1YjQuLjMwMTUyYTJiYTkgMTAwNjQ0Ci0tLSBhL2xpYmF2Zm9ybWF0L2ZsYWNfcGljdHVy ZS5jCisrKyBiL2xpYmF2Zm9ybWF0L2ZsYWNfcGljdHVyZS5jCkBAIC0yMCw2ICsyMCw5IEBACiAg Ki8KIAogI2luY2x1ZGUgImxpYmF2dXRpbC9pbnRyZWFkd3JpdGUuaCIKKyNpbmNsdWRlICJsaWJh dnV0aWwvYXZzdHJpbmcuaCIKKyNpbmNsdWRlICJsaWJhdnV0aWwvYmFzZTY0LmgiCisjaW5jbHVk ZSAibGliYXZ1dGlsL3BpeGRlc2MuaCIKICNpbmNsdWRlICJsaWJhdmNvZGVjL2J5dGVzdHJlYW0u aCIKICNpbmNsdWRlICJsaWJhdmNvZGVjL3BuZy5oIgogI2luY2x1ZGUgImF2Zm9ybWF0LmgiCkBA IC0xODgsMyArMTkxLDEzMiBAQCBmYWlsOgogCiAgICAgcmV0dXJuIHJldDsKIH0KKworaW50IGZm X2ZsYWNfd3JpdGVfcGljdHVyZShzdHJ1Y3QgQVZGb3JtYXRDb250ZXh0ICpzLAorICAgICAgICAg ICAgICAgICAgICAgICAgICBpbnQgaXNvZ2csCisgICAgICAgICAgICAgICAgICAgICAgICAgIHVu c2lnbmVkICphdHRhY2hlZF90eXBlcywKKyAgICAgICAgICAgICAgICAgICAgICAgICAgaW50IGF1 ZGlvX3N0cmVhbV9pZHgsIC8vIHVudXNlZCBpZiAhaXNvZ2cKKyAgICAgICAgICAgICAgICAgICAg ICAgICAgQVZQYWNrZXQgKnBrdCkKK3sKKyAgICBBVklPQ29udGV4dCAqcGIgPSBzLT5wYjsKKyAg ICBjb25zdCBBVlBpeEZtdERlc2NyaXB0b3IgKnBpeGRlc2M7CisgICAgY29uc3QgQ29kZWNNaW1l ICptaW1lID0gZmZfaWQzdjJfbWltZV90YWdzOworICAgIEFWRGljdGlvbmFyeUVudHJ5ICplOwor ICAgIGNvbnN0IGNoYXIgKm1pbWV0eXBlID0gTlVMTCwgKmRlc2MgPSAiIjsKKyAgICBjb25zdCBB VlN0cmVhbSAqc3QgPSBzLT5zdHJlYW1zW3BrdC0+c3RyZWFtX2luZGV4XTsKKyAgICBpbnQgaSwg bWltZWxlbiwgZGVzY2xlbiwgdHlwZSA9IDAsIGJsb2NrbGVuOworCisgICAgaWYgKCFwa3QtPmRh dGEpCisgICAgICAgIHJldHVybiAwOworCisgICAgd2hpbGUgKG1pbWUtPmlkICE9IEFWX0NPREVD X0lEX05PTkUpIHsKKyAgICAgICAgaWYgKG1pbWUtPmlkID09IHN0LT5jb2RlY3Bhci0+Y29kZWNf aWQpIHsKKyAgICAgICAgICAgIG1pbWV0eXBlID0gbWltZS0+c3RyOworICAgICAgICAgICAgYnJl YWs7CisgICAgICAgIH0KKyAgICAgICAgbWltZSsrOworICAgIH0KKyAgICBpZiAoIW1pbWV0eXBl KSB7CisgICAgICAgIGF2X2xvZyhzLCBBVl9MT0dfRVJST1IsICJObyBtaW1ldHlwZSBpcyBrbm93 biBmb3Igc3RyZWFtICVkLCBjYW5ub3QgIgorICAgICAgICAgICAgICAgIndyaXRlIGFuIGF0dGFj aGVkIHBpY3R1cmUuXG4iLCBzdC0+aW5kZXgpOworICAgICAgICByZXR1cm4gQVZFUlJPUihFSU5W QUwpOworICAgIH0KKyAgICBtaW1lbGVuID0gc3RybGVuKG1pbWV0eXBlKTsKKworICAgIC8qIGdl dCB0aGUgcGljdHVyZSB0eXBlICovCisgICAgZSA9IGF2X2RpY3RfZ2V0KHN0LT5tZXRhZGF0YSwg ImNvbW1lbnQiLCBOVUxMLCAwKTsKKyAgICBmb3IgKGkgPSAwOyBlICYmIGkgPCBGRl9BUlJBWV9F TEVNUyhmZl9pZDN2Ml9waWN0dXJlX3R5cGVzKTsgaSsrKSB7CisgICAgICAgIGlmICghYXZfc3Ry Y2FzZWNtcChlLT52YWx1ZSwgZmZfaWQzdjJfcGljdHVyZV90eXBlc1tpXSkpIHsKKyAgICAgICAg ICAgIHR5cGUgPSBpOworICAgICAgICAgICAgYnJlYWs7CisgICAgICAgIH0KKyAgICB9CisKKyAg ICBpZiAoKCgqYXR0YWNoZWRfdHlwZXMpICYgKDEgPDwgdHlwZSkpICYgMHg2KSB7CisgICAgICAg IGF2X2xvZyhzLCBBVl9MT0dfRVJST1IsICJEdXBsaWNhdGUgYXR0YWNobWVudCBmb3IgdHlwZSAn JXMnXG4iLCBmZl9pZDN2Ml9waWN0dXJlX3R5cGVzW3R5cGVdKTsKKyAgICAgICAgcmV0dXJuIEFW RVJST1IoRUlOVkFMKTsKKyAgICB9CisKKyAgICBpZiAodHlwZSA9PSAxICYmIChzdC0+Y29kZWNw YXItPmNvZGVjX2lkICE9IEFWX0NPREVDX0lEX1BORyB8fAorICAgICAgICAgICAgICAgICAgICAg IHN0LT5jb2RlY3Bhci0+d2lkdGggIT0gMzIgfHwKKyAgICAgICAgICAgICAgICAgICAgICBzdC0+ Y29kZWNwYXItPmhlaWdodCAhPSAzMikpIHsKKyAgICAgICAgYXZfbG9nKHMsIEFWX0xPR19FUlJP UiwgIkZpbGUgaWNvbiBhdHRhY2htZW50IG11c3QgYmUgYSAzMngzMiBQTkciKTsKKyAgICAgICAg cmV0dXJuIEFWRVJST1IoRUlOVkFMKTsKKyAgICB9CisKKyAgICAqYXR0YWNoZWRfdHlwZXMgfD0g KDEgPDwgdHlwZSk7CisKKyAgICAvKiBnZXQgdGhlIGRlc2NyaXB0aW9uICovCisgICAgaWYgKChl ID0gYXZfZGljdF9nZXQoc3QtPm1ldGFkYXRhLCAidGl0bGUiLCBOVUxMLCAwKSkpCisgICAgICAg IGRlc2MgPSBlLT52YWx1ZTsKKyAgICBkZXNjbGVuID0gc3RybGVuKGRlc2MpOworCisgICAgYmxv Y2tsZW4gPSA0ICsgNCArIG1pbWVsZW4gKyA0ICsgZGVzY2xlbiArIDQgKyA0ICsgNCArIDQgKyA0 ICsgcGt0LT5zaXplOworICAgIGlmIChibG9ja2xlbiA+PSAxPDwyNCkgeworICAgICAgICBhdl9s b2cocywgQVZfTE9HX0VSUk9SLCAiUGljdHVyZSBibG9jayB0b28gYmlnICVkID49ICVkXG4iLCBi bG9ja2xlbiwgMTw8MjQpOworICAgICAgICByZXR1cm4gQVZFUlJPUihFSU5WQUwpOworICAgIH0K KworICAgIGlmKCFpc29nZykgeworICAgICAgICBhdmlvX3c4KHBiLCAweDA2KTsKKyAgICAgICAg YXZpb193YjI0KHBiLCBibG9ja2xlbik7CisKKyAgICAgICAgYXZpb193YjMyKHBiLCB0eXBlKTsK KworICAgICAgICBhdmlvX3diMzIocGIsIG1pbWVsZW4pOworICAgICAgICBhdmlvX3dyaXRlKHBi LCBtaW1ldHlwZSwgbWltZWxlbik7CisKKyAgICAgICAgYXZpb193YjMyKHBiLCBkZXNjbGVuKTsK KyAgICAgICAgYXZpb193cml0ZShwYiwgZGVzYywgZGVzY2xlbik7CisKKyAgICAgICAgYXZpb193 YjMyKHBiLCBzdC0+Y29kZWNwYXItPndpZHRoKTsKKyAgICAgICAgYXZpb193YjMyKHBiLCBzdC0+ Y29kZWNwYXItPmhlaWdodCk7CisgICAgICAgIGlmICgocGl4ZGVzYyA9IGF2X3BpeF9mbXRfZGVz Y19nZXQoc3QtPmNvZGVjcGFyLT5mb3JtYXQpKSkKKyAgICAgICAgICAgIGF2aW9fd2IzMihwYiwg YXZfZ2V0X2JpdHNfcGVyX3BpeGVsKHBpeGRlc2MpKTsKKyAgICAgICAgZWxzZQorICAgICAgICAg ICAgYXZpb193YjMyKHBiLCAwKTsKKyAgICAgICAgYXZpb193YjMyKHBiLCAwKTsKKworICAgICAg ICBhdmlvX3diMzIocGIsIHBrdC0+c2l6ZSk7CisgICAgICAgIGF2aW9fd3JpdGUocGIsIHBrdC0+ ZGF0YSwgcGt0LT5zaXplKTsKKyAgICB9IGVsc2UgeworICAgICAgICB1aW50OF90ICptZXRhZGF0 YV9ibG9ja19waWN0dXJlLCAqcHRyOworICAgICAgICBpbnQgZW5jb2RlZF9sZW4sIHJldDsKKyAg ICAgICAgY2hhciAqZW5jb2RlZDsKKyAgICAgICAgQVZTdHJlYW0gKmF1ZGlvX3N0cmVhbSA9IHMt PnN0cmVhbXNbYXVkaW9fc3RyZWFtX2lkeF07CisKKyAgICAgICAgbWV0YWRhdGFfYmxvY2tfcGlj dHVyZSA9IGF2X21hbGxvY3ooYmxvY2tsZW4pOworICAgICAgICBwdHIgPSBtZXRhZGF0YV9ibG9j a19waWN0dXJlOworICAgICAgICBieXRlc3RyZWFtX3B1dF9iZTMyKCZwdHIsIHR5cGUpOworCisg ICAgICAgIGJ5dGVzdHJlYW1fcHV0X2JlMzIoJnB0ciwgbWltZWxlbik7CisgICAgICAgIGJ5dGVz dHJlYW1fcHV0X2J1ZmZlcigmcHRyLCBtaW1ldHlwZSwgbWltZWxlbik7CisKKyAgICAgICAgYnl0 ZXN0cmVhbV9wdXRfYmUzMigmcHRyLCBkZXNjbGVuKTsKKyAgICAgICAgYnl0ZXN0cmVhbV9wdXRf YnVmZmVyKCZwdHIsIGRlc2MsIGRlc2NsZW4pOworCisgICAgICAgIGJ5dGVzdHJlYW1fcHV0X2Jl MzIoJnB0ciwgc3QtPmNvZGVjcGFyLT53aWR0aCk7CisgICAgICAgIGJ5dGVzdHJlYW1fcHV0X2Jl MzIoJnB0ciwgc3QtPmNvZGVjcGFyLT5oZWlnaHQpOworICAgICAgICBpZiAoKHBpeGRlc2MgPSBh dl9waXhfZm10X2Rlc2NfZ2V0KHN0LT5jb2RlY3Bhci0+Zm9ybWF0KSkpCisgICAgICAgICAgICBi eXRlc3RyZWFtX3B1dF9iZTMyKCZwdHIsIGF2X2dldF9iaXRzX3Blcl9waXhlbChwaXhkZXNjKSk7 CisgICAgICAgIGVsc2UKKyAgICAgICAgICAgIGJ5dGVzdHJlYW1fcHV0X2JlMzIoJnB0ciwgMCk7 CisgICAgICAgIGJ5dGVzdHJlYW1fcHV0X2JlMzIoJnB0ciwgMCk7CisKKyAgICAgICAgYnl0ZXN0 cmVhbV9wdXRfYmUzMigmcHRyLCBwa3QtPnNpemUpOworICAgICAgICBieXRlc3RyZWFtX3B1dF9i dWZmZXIoJnB0ciwgcGt0LT5kYXRhLCBwa3QtPnNpemUpOworCisgICAgICAgIGVuY29kZWRfbGVu ID0gQVZfQkFTRTY0X1NJWkUoYmxvY2tsZW4pOworICAgICAgICBlbmNvZGVkID0gYXZfbWFsbG9j eihlbmNvZGVkX2xlbik7CisgICAgICAgIGF2X2Jhc2U2NF9lbmNvZGUoZW5jb2RlZCwgZW5jb2Rl ZF9sZW4sIG1ldGFkYXRhX2Jsb2NrX3BpY3R1cmUsIGJsb2NrbGVuKTsKKyAgICAgICAgYXZfZnJl ZShtZXRhZGF0YV9ibG9ja19waWN0dXJlKTsKKworICAgICAgICByZXQgPSBhdl9kaWN0X3NldCgm YXVkaW9fc3RyZWFtLT5tZXRhZGF0YSwgIk1FVEFEQVRBX0JMT0NLX1BJQ1RVUkUiLCBlbmNvZGVk LCAwKTsKKyAgICAgICAgYXZfZnJlZShlbmNvZGVkKTsKKyAgICAgICAgYXZfcGFja2V0X3VucmVm KHBrdCk7CisKKyAgICAgICAgaWYgKHJldCA8IDApCisgICAgICAgICAgICByZXR1cm4gcmV0Owor ICAgIH0KKyAgICByZXR1cm4gMDsKK30KZGlmZiAtLWdpdCBhL2xpYmF2Zm9ybWF0L2ZsYWNfcGlj dHVyZS5oIGIvbGliYXZmb3JtYXQvZmxhY19waWN0dXJlLmgKaW5kZXggZGIwNzRlNTMxZC4uZWZh MTFhZWUzMiAxMDA2NDQKLS0tIGEvbGliYXZmb3JtYXQvZmxhY19waWN0dXJlLmgKKysrIGIvbGli YXZmb3JtYXQvZmxhY19waWN0dXJlLmgKQEAgLTM5LDUgKzM5LDEwIEBACiAgKi8KIGludCBmZl9m bGFjX3BhcnNlX3BpY3R1cmUoQVZGb3JtYXRDb250ZXh0ICpzLCB1aW50OF90ICoqYnVmLCBpbnQg YnVmX3NpemUsCiAgICAgICAgICAgICAgICAgICAgICAgICAgIGludCB0cnVuY2F0ZV93b3JrYXJv dW5kKTsKK2ludCBmZl9mbGFjX3dyaXRlX3BpY3R1cmUoc3RydWN0IEFWRm9ybWF0Q29udGV4dCAq cywKKyAgICAgICAgICAgICAgICAgICAgICAgICAgaW50IGlzb2dnLAorICAgICAgICAgICAgICAg ICAgICAgICAgICB1bnNpZ25lZCAqYXR0YWNoZWRfdHlwZXMsCisgICAgICAgICAgICAgICAgICAg ICAgICAgIGludCBhdWRpb19zdHJlYW1faWR4LAorICAgICAgICAgICAgICAgICAgICAgICAgICBB VlBhY2tldCAqcGt0KTsKIAogI2VuZGlmIC8qIEFWRk9STUFUX0ZMQUNfUElDVFVSRV9IICovCmRp ZmYgLS1naXQgYS9saWJhdmZvcm1hdC9mbGFjZW5jLmMgYi9saWJhdmZvcm1hdC9mbGFjZW5jLmMK aW5kZXggYThiZWVjNzc1MC4uNzk3MGMyNTMxZCAxMDA2NDQKLS0tIGEvbGliYXZmb3JtYXQvZmxh Y2VuYy5jCisrKyBiL2xpYmF2Zm9ybWF0L2ZsYWNlbmMuYwpAQCAtMzMsNiArMzMsNyBAQAogI2lu Y2x1ZGUgIm11eC5oIgogI2luY2x1ZGUgInZlcnNpb24uaCIKICNpbmNsdWRlICJ2b3JiaXNjb21t ZW50LmgiCisjaW5jbHVkZSAiZmxhY19waWN0dXJlLmgiCiAKIAogdHlwZWRlZiBzdHJ1Y3QgRmxh Y011eGVyQ29udGV4dCB7CkBAIC03OSw5NCArODAsOSBAQCBzdGF0aWMgaW50IGZsYWNfd3JpdGVf YmxvY2tfY29tbWVudChBVklPQ29udGV4dCAqcGIsIEFWRGljdGlvbmFyeSAqKm0sCiAgICAgcmV0 dXJuIDA7CiB9CiAKLXN0YXRpYyBpbnQgZmxhY193cml0ZV9waWN0dXJlKHN0cnVjdCBBVkZvcm1h dENvbnRleHQgKnMsIEFWUGFja2V0ICpwa3QpCi17Ci0gICAgRmxhY011eGVyQ29udGV4dCAqYyA9 IHMtPnByaXZfZGF0YTsKLSAgICBBVklPQ29udGV4dCAqcGIgPSBzLT5wYjsKLSAgICBjb25zdCBB VlBpeEZtdERlc2NyaXB0b3IgKnBpeGRlc2M7Ci0gICAgY29uc3QgQ29kZWNNaW1lICptaW1lID0g ZmZfaWQzdjJfbWltZV90YWdzOwotICAgIEFWRGljdGlvbmFyeUVudHJ5ICplOwotICAgIGNvbnN0 IGNoYXIgKm1pbWV0eXBlID0gTlVMTCwgKmRlc2MgPSAiIjsKLSAgICBjb25zdCBBVlN0cmVhbSAq c3QgPSBzLT5zdHJlYW1zW3BrdC0+c3RyZWFtX2luZGV4XTsKLSAgICBpbnQgaSwgbWltZWxlbiwg ZGVzY2xlbiwgdHlwZSA9IDAsIGJsb2NrbGVuOwotCi0gICAgaWYgKCFwa3QtPmRhdGEpCi0gICAg ICAgIHJldHVybiAwOwotCi0gICAgd2hpbGUgKG1pbWUtPmlkICE9IEFWX0NPREVDX0lEX05PTkUp IHsKLSAgICAgICAgaWYgKG1pbWUtPmlkID09IHN0LT5jb2RlY3Bhci0+Y29kZWNfaWQpIHsKLSAg ICAgICAgICAgIG1pbWV0eXBlID0gbWltZS0+c3RyOwotICAgICAgICAgICAgYnJlYWs7Ci0gICAg ICAgIH0KLSAgICAgICAgbWltZSsrOwotICAgIH0KLSAgICBpZiAoIW1pbWV0eXBlKSB7Ci0gICAg ICAgIGF2X2xvZyhzLCBBVl9MT0dfRVJST1IsICJObyBtaW1ldHlwZSBpcyBrbm93biBmb3Igc3Ry ZWFtICVkLCBjYW5ub3QgIgotICAgICAgICAgICAgICAgIndyaXRlIGFuIGF0dGFjaGVkIHBpY3R1 cmUuXG4iLCBzdC0+aW5kZXgpOwotICAgICAgICByZXR1cm4gQVZFUlJPUihFSU5WQUwpOwotICAg IH0KLSAgICBtaW1lbGVuID0gc3RybGVuKG1pbWV0eXBlKTsKLQotICAgIC8qIGdldCB0aGUgcGlj dHVyZSB0eXBlICovCi0gICAgZSA9IGF2X2RpY3RfZ2V0KHN0LT5tZXRhZGF0YSwgImNvbW1lbnQi LCBOVUxMLCAwKTsKLSAgICBmb3IgKGkgPSAwOyBlICYmIGkgPCBGRl9BUlJBWV9FTEVNUyhmZl9p ZDN2Ml9waWN0dXJlX3R5cGVzKTsgaSsrKSB7Ci0gICAgICAgIGlmICghYXZfc3RyY2FzZWNtcChl LT52YWx1ZSwgZmZfaWQzdjJfcGljdHVyZV90eXBlc1tpXSkpIHsKLSAgICAgICAgICAgIHR5cGUg PSBpOwotICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAgIH0KLSAgICB9Ci0KLSAgICBpZiAoKGMt PmF0dGFjaGVkX3R5cGVzICYgKDEgPDwgdHlwZSkpICYgMHg2KSB7Ci0gICAgICAgIGF2X2xvZyhz LCBBVl9MT0dfRVJST1IsICJEdXBsaWNhdGUgYXR0YWNobWVudCBmb3IgdHlwZSAnJXMnXG4iLCBm Zl9pZDN2Ml9waWN0dXJlX3R5cGVzW3R5cGVdKTsKLSAgICAgICAgcmV0dXJuIEFWRVJST1IoRUlO VkFMKTsKLSAgICB9Ci0KLSAgICBpZiAodHlwZSA9PSAxICYmIChzdC0+Y29kZWNwYXItPmNvZGVj X2lkICE9IEFWX0NPREVDX0lEX1BORyB8fAotICAgICAgICAgICAgICAgICAgICAgIHN0LT5jb2Rl Y3Bhci0+d2lkdGggIT0gMzIgfHwKLSAgICAgICAgICAgICAgICAgICAgICBzdC0+Y29kZWNwYXIt PmhlaWdodCAhPSAzMikpIHsKLSAgICAgICAgYXZfbG9nKHMsIEFWX0xPR19FUlJPUiwgIkZpbGUg aWNvbiBhdHRhY2htZW50IG11c3QgYmUgYSAzMngzMiBQTkciKTsKLSAgICAgICAgcmV0dXJuIEFW RVJST1IoRUlOVkFMKTsKLSAgICB9Ci0KLSAgICBjLT5hdHRhY2hlZF90eXBlcyB8PSAoMSA8PCB0 eXBlKTsKLQotICAgIC8qIGdldCB0aGUgZGVzY3JpcHRpb24gKi8KLSAgICBpZiAoKGUgPSBhdl9k aWN0X2dldChzdC0+bWV0YWRhdGEsICJ0aXRsZSIsIE5VTEwsIDApKSkKLSAgICAgICAgZGVzYyA9 IGUtPnZhbHVlOwotICAgIGRlc2NsZW4gPSBzdHJsZW4oZGVzYyk7Ci0KLSAgICBibG9ja2xlbiA9 IDQgKyA0ICsgbWltZWxlbiArIDQgKyBkZXNjbGVuICsgNCArIDQgKyA0ICsgNCArIDQgKyBwa3Qt PnNpemU7Ci0gICAgaWYgKGJsb2NrbGVuID49IDE8PDI0KSB7Ci0gICAgICAgIGF2X2xvZyhzLCBB Vl9MT0dfRVJST1IsICJQaWN0dXJlIGJsb2NrIHRvbyBiaWcgJWQgPj0gJWRcbiIsIGJsb2NrbGVu LCAxPDwyNCk7Ci0gICAgICAgIHJldHVybiBBVkVSUk9SKEVJTlZBTCk7Ci0gICAgfQotCi0gICAg YXZpb193OChwYiwgMHgwNik7Ci0gICAgYXZpb193YjI0KHBiLCBibG9ja2xlbik7Ci0KLSAgICBh dmlvX3diMzIocGIsIHR5cGUpOwotCi0gICAgYXZpb193YjMyKHBiLCBtaW1lbGVuKTsKLSAgICBh dmlvX3dyaXRlKHBiLCBtaW1ldHlwZSwgbWltZWxlbik7Ci0KLSAgICBhdmlvX3diMzIocGIsIGRl c2NsZW4pOwotICAgIGF2aW9fd3JpdGUocGIsIGRlc2MsIGRlc2NsZW4pOwotCi0gICAgYXZpb193 YjMyKHBiLCBzdC0+Y29kZWNwYXItPndpZHRoKTsKLSAgICBhdmlvX3diMzIocGIsIHN0LT5jb2Rl Y3Bhci0+aGVpZ2h0KTsKLSAgICBpZiAoKHBpeGRlc2MgPSBhdl9waXhfZm10X2Rlc2NfZ2V0KHN0 LT5jb2RlY3Bhci0+Zm9ybWF0KSkpCi0gICAgICAgIGF2aW9fd2IzMihwYiwgYXZfZ2V0X2JpdHNf cGVyX3BpeGVsKHBpeGRlc2MpKTsKLSAgICBlbHNlCi0gICAgICAgIGF2aW9fd2IzMihwYiwgMCk7 Ci0gICAgYXZpb193YjMyKHBiLCAwKTsKLQotICAgIGF2aW9fd2IzMihwYiwgcGt0LT5zaXplKTsK LSAgICBhdmlvX3dyaXRlKHBiLCBwa3QtPmRhdGEsIHBrdC0+c2l6ZSk7Ci0gICAgcmV0dXJuIDA7 Ci19Ci0KIHN0YXRpYyBpbnQgZmxhY19maW5pc2hfaGVhZGVyKHN0cnVjdCBBVkZvcm1hdENvbnRl eHQgKnMpCiB7CisgICAgRmxhY011eGVyQ29udGV4dCAqYyA9IHMtPnByaXZfZGF0YTsKICAgICBp bnQgaSwgcmV0LCBwYWRkaW5nID0gcy0+bWV0YWRhdGFfaGVhZGVyX3BhZGRpbmc7CiAgICAgaWYg KHBhZGRpbmcgPCAwKQogICAgICAgICBwYWRkaW5nID0gODE5MjsKQEAgLTE3OSw3ICs5NSw3IEBA IHN0YXRpYyBpbnQgZmxhY19maW5pc2hfaGVhZGVyKHN0cnVjdCBBVkZvcm1hdENvbnRleHQgKnMp CiAgICAgICAgIEFWUGFja2V0ICpwa3QgPSBzdC0+cHJpdl9kYXRhOwogICAgICAgICBpZiAoIXBr dCkKICAgICAgICAgICAgIGNvbnRpbnVlOwotICAgICAgICByZXQgPSBmbGFjX3dyaXRlX3BpY3R1 cmUocywgcGt0KTsKKyAgICAgICAgcmV0ID0gZmZfZmxhY193cml0ZV9waWN0dXJlKHMsIDAsICZj LT5hdHRhY2hlZF90eXBlcywgLTEsIHBrdCk7CiAgICAgICAgIGF2X3BhY2tldF91bnJlZihwa3Qp OwogICAgICAgICBpZiAocmV0IDwgMCAmJiAocy0+ZXJyb3JfcmVjb2duaXRpb24gJiBBVl9FRl9F WFBMT0RFKSkKICAgICAgICAgICAgIHJldHVybiByZXQ7Ci0tIAoyLjM0LjEKCg== --b1_4Qnv6SsKk4tCoFKjNGyES1gX8UIOCI7ftQS5NUmtsw 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". --b1_4Qnv6SsKk4tCoFKjNGyES1gX8UIOCI7ftQS5NUmtsw--