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 2317F46AB2 for ; Mon, 29 Jul 2024 03:31:53 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 676DE68D3C9; Mon, 29 Jul 2024 06:31:50 +0300 (EEST) Received: from mout.gmx.net (mout.gmx.net [212.227.17.20]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0D08168CDE5 for ; Mon, 29 Jul 2024 06:31:44 +0300 (EEST) X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a Received: from [192.168.11.12] ([95.33.106.8]) by mail.gmx.net (mrgmx104 [212.227.17.168]) with ESMTPSA (Nemesis) id 1MDysm-1sOPDn00k0-006BgZ for ; Mon, 29 Jul 2024 05:31:43 +0200 Content-Type: multipart/mixed; boundary="------------91gm69m08i3e4GsoPMN9WISs" Message-ID: <7d837387-58ff-48be-9d24-3ac175c67af3@gmx.net> Date: Mon, 29 Jul 2024 05:31:42 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird To: ffmpeg-devel@ffmpeg.org References: Content-Language: de-DE, en-US In-Reply-To: X-Provags-ID: V03:K1:5YwbHTEojw55cTnaX/FbzRRf297/VZfIpYUQ23Gf4Vd2383Fk6m 0Q9DOaY1UnYp7VRAcUxPrdpNY6famVAkyZ3Z/VGi3EVgHR7BBZ5heHNlE7BPGQs7Q0mloZm j6h8yK68pBd8X+ID8FfeUIAMlOQwfhCDQPKLfQyEKf7XkN70mZgOQSHYaEnTrfX+rYNnyDk hgg/QyYBU9kyP+MUQb9Mg== X-Spam-Flag: NO UI-OutboundReport: notjunk:1;M01:P0:qhv+L2hCXfI=;PGLDXViZe8CDl4ocXOO8qBEQK1P n6hqsfURHDi0hdyVdROU2i4LG4Q5p/6F0WTTml7Kufi99EEN04hfGGkMEsMbCu/b/0DO/in0U OUEbkMA0A5Riz/U3X6q/MpQpKohHo3PoR6FQD+qYU6D9/H0zdtKj9vchjNs25+Bnmm9B3y/mA Ur3f1YqbQ/FklKh4mq7AY3r1jaaxEKVw6Dfwa8agUAIFi101B6AWNPW2AR7bBbLiGc1d+Brrc emxP7PyRVa0/4HYL9plLEHN76wUJqarCz7TOZteMcDXl1DP9x08r2FbSPTh13tnIJh2llT0dA 9DUcFeXOgSLju7ub7aXpftkKft8L+cj0IpdVxU1kk5eVrtoSnAiYu3bQAUpIf2XPhNXwsXJW4 OdF1pPO7KUpXsnfmXIIySWaoMLBmHONOYPPbPzGI41UaxaalT+FtBMPT1w3M1tVBL3PSNv+iS RVfhiA1R7eTanZ8bOfHB+ADZMT16nMnU3RU9Y3DA1T3DuH33mrisKg+cdVDm5Rqn5QkK2YHqH 5C6AvdF89HjnqqpqyZuhBST4IlIK1lsgFrVGm+tgyNWjQkV0rW0ZMRdKun0HJkcP9OUyDTlhJ yCusR8rOU1Itw+gVl0Hqj+jB7OE+CfbqsOEOxQ7vDmgQq2xe3x2+veZaJEvcMGBtYfsYFttWY w3bU5+RywWCHLZwLywp6XZBXLbDhhDMj6SJeGHV+fNBsEmO9e2Q5+jnKdDlRy4x9uslHS80p9 Fhog0JvlSlSz42VtimWqrV6LFZ4zHouyTBnYIkJkWY1jEXspX0eDe9YDGWPKPksJ8/vbPw+2N f+Q1sV0vuHQfUBmb9Pycm/xA== Subject: Re: [FFmpeg-devel] [PATCH v4 1/2] libavformat/vapoursynth: Update to API version 4, load library at runtime 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: Stefan Oltmanns via ffmpeg-devel Reply-To: FFmpeg development discussions and patches Cc: Stefan Oltmanns 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. --------------91gm69m08i3e4GsoPMN9WISs Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: quoted-printable Am 28.07.24 um 15:09 schrieb Ramiro Polla: >> =C2=A0=C2=A0=C2=A0=C2=A0 if (st->codecpar->format =3D=3D AV_PIX_FMT_NON= E) { >> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 av_log(s, AV_LOG_ERROR, "Un= supported VS pixel format %s\n", >> info->format->name); >> +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 if(vs->vsapi->getVideoForma= tName(&info->format, vsfmt)) >> +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 av_= log(s, AV_LOG_ERROR, "Unsupported VS pixel format >> %s\n", vsfmt); >> +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 else >> +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 av_= log(s, AV_LOG_ERROR, "Unsupported VS pixel format\n"); >> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 err =3D AVERROR_EXTERN= AL; >> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 goto done; >> =C2=A0=C2=A0=C2=A0=C2=A0 } >> -=C2=A0=C2=A0=C2=A0 av_log(s, AV_LOG_VERBOSE, "VS format %s -> pixfmt %= s\n", >> info->format->name, >> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 av_get_pi= x_fmt_name(st->codecpar->format)); >> - >> -=C2=A0=C2=A0=C2=A0 if (info->format->colorFamily =3D=3D cmYCoCg) >> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 st->codecpar->color_space = =3D AVCOL_SPC_YCGCO; >> +=C2=A0=C2=A0=C2=A0 if (vs->vsapi->getVideoFormatName(&info->format, vs= fmt)) >> +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 av_log(s, AV_LOG_VERBOSE, "= VS format %s -> pixfmt %s\n", >> +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0 vsfmt, av_get_pix_fmt_name(st->codecpar->format)); >> +=C2=A0=C2=A0=C2=A0 else >> +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 av_log(s, AV_LOG_VERBOSE, "= VS format -> pixfmt %s\n", >> +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0 av_get_pix_fmt_name(st->codecpar->format)); > > Could you change this to have a single call go av_log()? Possibly using > a %s with a string for the unknown format. Same thing for the other > av_log() above. > > [...] It now prints "(unknown)" for a video format that VapourSynth cannot resolve. "(unknown)" is also printed at other places in ffmpeg in similar cases, so it's consistent. > > Also could you give us a very minimal test script to test this? I have attached a minimal test script, it will generate 10 frames each black, red, green, blue in 640x480, RGB24 Best regards Stefan --------------91gm69m08i3e4GsoPMN9WISs Content-Type: text/x-patch; charset=UTF-8; name="0001-avformat-vapoursynth-Update-to-API-version-4.patch" Content-Disposition: attachment; filename="0001-avformat-vapoursynth-Update-to-API-version-4.patch" Content-Transfer-Encoding: base64 RnJvbSAyMjc5ZDJlMjI1YzY2NWNhYjY4ZDI2NjUyZTFjY2E0ZmRmMDRmYWFhIE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBTdGVmYW4gT2x0bWFubnMgPHN0ZWZhbi1vbHRtYW5u c0BnbXgubmV0PgpEYXRlOiBNb24sIDI5IEp1bCAyMDI0IDA1OjA4OjU3ICswMjAwClN1Ympl Y3Q6IFtQQVRDSCAxLzJdIGF2Zm9ybWF0L3ZhcG91cnN5bnRoOiBVcGRhdGUgdG8gQVBJIHZl cnNpb24gNAoKU2lnbmVkLW9mZi1ieTogU3RlZmFuIE9sdG1hbm5zIDxzdGVmYW4tb2x0bWFu bnNAZ214Lm5ldD4KLS0tCiBjb25maWd1cmUgICAgICAgICAgICAgICAgIHwgIDIgKy0KIGxp YmF2Zm9ybWF0L3ZhcG91cnN5bnRoLmMgfCA3NyArKysrKysrKysrKysrKysrKysrKy0tLS0t LS0tLS0tLS0tLS0tLS0KIDIgZmlsZXMgY2hhbmdlZCwgNDAgaW5zZXJ0aW9ucygrKSwgMzkg ZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvY29uZmlndXJlIGIvY29uZmlndXJlCmluZGV4 IGY2ZjVjMjlmZWEuLmM1MGI1YWQ0YjQgMTAwNzU1Ci0tLSBhL2NvbmZpZ3VyZQorKysgYi9j b25maWd1cmUKQEAgLTcwODUsNyArNzA4NSw3IEBAIGVuYWJsZWQgcmttcHAgICAgICAgICAg ICAgJiYgeyByZXF1aXJlX3BrZ19jb25maWcgcmttcHAgcm9ja2NoaXBfbXBwICByb2NrY2hp cC9yCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgeyBlbmFibGVkIGxpYmRybSB8 fAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZGllICJFUlJPUjogcmttcHAg cmVxdWlyZXMgLS1lbmFibGUtbGliZHJtIjsgfQogICAgICAgICAgICAgICAgICAgICAgICAg ICAgICB9Ci1lbmFibGVkIHZhcG91cnN5bnRoICAgICAgICYmIHJlcXVpcmVfcGtnX2NvbmZp ZyB2YXBvdXJzeW50aCAidmFwb3Vyc3ludGgtc2NyaXB0ID49IDQyIiBWU1NjcmlwdC5oIHZz c2NyaXB0X2luaXQKK2VuYWJsZWQgdmFwb3Vyc3ludGggICAgICAgJiYgcmVxdWlyZV9wa2df Y29uZmlnIHZhcG91cnN5bnRoICJ2YXBvdXJzeW50aC1zY3JpcHQgPj0gNTUiIFZTU2NyaXB0 NC5oIGdldFZTU2NyaXB0QVBJCiAKIAogaWYgZW5hYmxlZCBnY3J5cHQ7IHRoZW4KZGlmZiAt LWdpdCBhL2xpYmF2Zm9ybWF0L3ZhcG91cnN5bnRoLmMgYi9saWJhdmZvcm1hdC92YXBvdXJz eW50aC5jCmluZGV4IDhhMjUxOWUxOWEuLjI2Yzk5ODYxMzggMTAwNjQ0Ci0tLSBhL2xpYmF2 Zm9ybWF0L3ZhcG91cnN5bnRoLmMKKysrIGIvbGliYXZmb3JtYXQvdmFwb3Vyc3ludGguYwpA QCAtMjUsOCArMjUsNyBAQAogCiAjaW5jbHVkZSA8bGltaXRzLmg+CiAKLSNpbmNsdWRlIDxW YXBvdXJTeW50aC5oPgotI2luY2x1ZGUgPFZTU2NyaXB0Lmg+CisjaW5jbHVkZSA8VlNTY3Jp cHQ0Lmg+CiAKICNpbmNsdWRlICJsaWJhdnV0aWwvYXZhc3NlcnQuaCIKICNpbmNsdWRlICJs aWJhdnV0aWwvYXZzdHJpbmcuaCIKQEAgLTQxLDYgKzQwLDcgQEAKICNpbmNsdWRlICJpbnRl cm5hbC5oIgogCiBzdHJ1Y3QgVlNTdGF0ZSB7CisgICAgY29uc3QgVlNTQ1JJUFRBUEkgKnZz c2FwaTsKICAgICBWU1NjcmlwdCAqdnNzOwogfTsKIApAQCAtNDksMTAgKzQ5LDEwIEBAIHR5 cGVkZWYgc3RydWN0IFZTQ29udGV4dCB7CiAKICAgICBBVkJ1ZmZlclJlZiAqdnNzX3N0YXRl OwogCisgICAgY29uc3QgVlNTQ1JJUFRBUEkgKnZzc2FwaTsKICAgICBjb25zdCBWU0FQSSAq dnNhcGk7Ci0gICAgVlNDb3JlICp2c2NvcmU7CiAKLSAgICBWU05vZGVSZWYgKm91dG5vZGU7 CisgICAgVlNOb2RlICpvdXRub2RlOwogICAgIGludCBpc19jZnI7CiAgICAgaW50IGN1cnJl bnRfZnJhbWU7CiAKQEAgLTc1LDggKzc1LDcgQEAgc3RhdGljIHZvaWQgZnJlZV92c3Nfc3Rh dGUodm9pZCAqb3BhcXVlLCB1aW50OF90ICpkYXRhKQogICAgIHN0cnVjdCBWU1N0YXRlICp2 c3MgPSBvcGFxdWU7CiAKICAgICBpZiAodnNzLT52c3MpIHsKLSAgICAgICAgdnNzY3JpcHRf ZnJlZVNjcmlwdCh2c3MtPnZzcyk7Ci0gICAgICAgIHZzc2NyaXB0X2ZpbmFsaXplKCk7Cisg ICAgICAgIHZzcy0+dnNzYXBpLT5mcmVlU2NyaXB0KHZzcy0+dnNzKTsKICAgICB9CiB9CiAK QEAgLTkwLDcgKzg5LDYgQEAgc3RhdGljIGF2X2NvbGQgaW50IHJlYWRfY2xvc2VfdnMoQVZG b3JtYXRDb250ZXh0ICpzKQogICAgIGF2X2J1ZmZlcl91bnJlZigmdnMtPnZzc19zdGF0ZSk7 CiAKICAgICB2cy0+dnNhcGkgPSBOVUxMOwotICAgIHZzLT52c2NvcmUgPSBOVUxMOwogICAg IHZzLT5vdXRub2RlID0gTlVMTDsKIAogICAgIHJldHVybiAwOwpAQCAtMTA2LDcgKzEwNCw3 IEBAIHN0YXRpYyBhdl9jb2xkIGludCBpc19uYXRpdmVfZW5kaWFuKGVudW0gQVZQaXhlbEZv cm1hdCBwaXhmbXQpCiAgICAgcmV0dXJuIHBkICYmICghIUhBVkVfQklHRU5ESUFOID09ICEh KHBkLT5mbGFncyAmIEFWX1BJWF9GTVRfRkxBR19CRSkpOwogfQogCi1zdGF0aWMgYXZfY29s ZCBlbnVtIEFWUGl4ZWxGb3JtYXQgbWF0Y2hfcGl4Zm10KGNvbnN0IFZTRm9ybWF0ICp2c2Ys IGludCBjX29yZGVyWzRdKQorc3RhdGljIGF2X2NvbGQgZW51bSBBVlBpeGVsRm9ybWF0IG1h dGNoX3BpeGZtdChjb25zdCBWU1ZpZGVvRm9ybWF0ICp2c2YsIGludCBjX29yZGVyWzRdKQog ewogICAgIHN0YXRpYyBjb25zdCBpbnQgeXV2X29yZGVyWzRdID0gezAsIDEsIDIsIDB9Owog ICAgIHN0YXRpYyBjb25zdCBpbnQgcmdiX29yZGVyWzRdID0gezEsIDIsIDAsIDB9OwpAQCAt MTI4LDEzICsxMjYsMTIgQEAgc3RhdGljIGF2X2NvbGQgZW51bSBBVlBpeGVsRm9ybWF0IG1h dGNoX3BpeGZtdChjb25zdCBWU0Zvcm1hdCAqdnNmLCBpbnQgY19vcmRlclsKICAgICAgICAg ICAgIHBkLT5sb2cyX2Nocm9tYV9oICE9IHZzZi0+c3ViU2FtcGxpbmdIKQogICAgICAgICAg ICAgY29udGludWU7CiAKLSAgICAgICAgaXNfcmdiID0gdnNmLT5jb2xvckZhbWlseSA9PSBj bVJHQjsKKyAgICAgICAgaXNfcmdiID0gdnNmLT5jb2xvckZhbWlseSA9PSBjZlJHQjsKICAg ICAgICAgaWYgKGlzX3JnYiAhPSAhIShwZC0+ZmxhZ3MgJiBBVl9QSVhfRk1UX0ZMQUdfUkdC KSkKICAgICAgICAgICAgIGNvbnRpbnVlOwogCi0gICAgICAgIGlzX3l1diA9IHZzZi0+Y29s b3JGYW1pbHkgPT0gY21ZVVYgfHwKLSAgICAgICAgICAgICAgICAgdnNmLT5jb2xvckZhbWls eSA9PSBjbVlDb0NnIHx8Ci0gICAgICAgICAgICAgICAgIHZzZi0+Y29sb3JGYW1pbHkgPT0g Y21HcmF5OworICAgICAgICBpc195dXYgPSB2c2YtPmNvbG9yRmFtaWx5ID09IGNmWVVWIHx8 CisgICAgICAgICAgICAgICAgIHZzZi0+Y29sb3JGYW1pbHkgPT0gY2ZHcmF5OwogICAgICAg ICBpZiAoIWlzX3JnYiAmJiAhaXNfeXV2KQogICAgICAgICAgICAgY29udGludWU7CiAKQEAg LTE3NiwxNSArMTczLDMwIEBAIHN0YXRpYyBhdl9jb2xkIGludCByZWFkX2hlYWRlcl92cyhB VkZvcm1hdENvbnRleHQgKnMpCiAgICAgaW50NjRfdCBzeiA9IGF2aW9fc2l6ZShwYik7CiAg ICAgY2hhciAqYnVmID0gTlVMTDsKICAgICBjaGFyIGR1bW15OworICAgIGNoYXIgdnNmbXRb MzJdOwogICAgIGNvbnN0IFZTVmlkZW9JbmZvICppbmZvOwogICAgIHN0cnVjdCBWU1N0YXRl ICp2c3Nfc3RhdGU7CiAgICAgaW50IGVyciA9IDA7CiAKKyAgICBpZiAoISh2cy0+dnNzYXBp ID0gZ2V0VlNTY3JpcHRBUEkoVlNTQ1JJUFRfQVBJX1ZFUlNJT04pKSkgeworICAgICAgICBh dl9sb2cocywgQVZfTE9HX0VSUk9SLCAiRmFpbGVkIHRvIGluaXRpYWxpemUgVlNTY3JpcHQg KHBvc3NpYmx5IFBZVEhPTlBBVEggbm90IHNldCkuXG4iKTsKKyAgICAgICAgZXJyID0gQVZF UlJPUl9FWFRFUk5BTDsKKyAgICAgICAgZ290byBkb25lOworICAgIH0KKworICAgIGlmICgh KHZzLT52c2FwaSA9IHZzLT52c3NhcGktPmdldFZTQVBJKFZBUE9VUlNZTlRIX0FQSV9WRVJT SU9OKSkpIHsKKyAgICAgICAgYXZfbG9nKHMsIEFWX0xPR19FUlJPUiwgIkNvdWxkIG5vdCBn ZXQgVlNBUEkuICIKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIkNoZWNrIFZh cG91clN5bnRoIGluc3RhbGxhdGlvbi5cbiIpOworICAgICAgICBlcnIgPSBBVkVSUk9SX0VY VEVSTkFMOworICAgICAgICBnb3RvIGRvbmU7CisgICAgfQorCiAgICAgdnNzX3N0YXRlID0g YXZfbWFsbG9jeihzaXplb2YoKnZzc19zdGF0ZSkpOwogICAgIGlmICghdnNzX3N0YXRlKSB7 CiAgICAgICAgIGVyciA9IEFWRVJST1IoRU5PTUVNKTsKICAgICAgICAgZ290byBkb25lOwog ICAgIH0KKyAgICB2c3Nfc3RhdGUtPnZzc2FwaSA9IHZzLT52c3NhcGk7CiAKICAgICB2cy0+ dnNzX3N0YXRlID0gYXZfYnVmZmVyX2NyZWF0ZShOVUxMLCAwLCBmcmVlX3Zzc19zdGF0ZSwg dnNzX3N0YXRlLCAwKTsKICAgICBpZiAoIXZzLT52c3Nfc3RhdGUpIHsKQEAgLTE5MywxNiAr MjA1LDkgQEAgc3RhdGljIGF2X2NvbGQgaW50IHJlYWRfaGVhZGVyX3ZzKEFWRm9ybWF0Q29u dGV4dCAqcykKICAgICAgICAgZ290byBkb25lOwogICAgIH0KIAotICAgIGlmICghdnNzY3Jp cHRfaW5pdCgpKSB7Ci0gICAgICAgIGF2X2xvZyhzLCBBVl9MT0dfRVJST1IsICJGYWlsZWQg dG8gaW5pdGlhbGl6ZSBWU1NjcmlwdCAocG9zc2libHkgUFlUSE9OUEFUSCBub3Qgc2V0KS5c biIpOwotICAgICAgICBlcnIgPSBBVkVSUk9SX0VYVEVSTkFMOwotICAgICAgICBnb3RvIGRv bmU7Ci0gICAgfQotCi0gICAgaWYgKHZzc2NyaXB0X2NyZWF0ZVNjcmlwdCgmdnNzX3N0YXRl LT52c3MpKSB7CisgICAgaWYgKCEodnNzX3N0YXRlLT52c3MgPSB2cy0+dnNzYXBpLT5jcmVh dGVTY3JpcHQoTlVMTCkpKSB7CiAgICAgICAgIGF2X2xvZyhzLCBBVl9MT0dfRVJST1IsICJG YWlsZWQgdG8gY3JlYXRlIHNjcmlwdCBpbnN0YW5jZS5cbiIpOwogICAgICAgICBlcnIgPSBB VkVSUk9SX0VYVEVSTkFMOwotICAgICAgICB2c3NjcmlwdF9maW5hbGl6ZSgpOwogICAgICAg ICBnb3RvIGRvbmU7CiAgICAgfQogCkBAIC0yMzUsMTcgKzI0MCwxNCBAQCBzdGF0aWMgYXZf Y29sZCBpbnQgcmVhZF9oZWFkZXJfdnMoQVZGb3JtYXRDb250ZXh0ICpzKQogICAgIH0KIAog ICAgIGJ1Zltzel0gPSAnXDAnOwotICAgIGlmICh2c3NjcmlwdF9ldmFsdWF0ZVNjcmlwdCgm dnNzX3N0YXRlLT52c3MsIGJ1Ziwgcy0+dXJsLCAwKSkgewotICAgICAgICBjb25zdCBjaGFy ICptc2cgPSB2c3NjcmlwdF9nZXRFcnJvcih2c3Nfc3RhdGUtPnZzcyk7CisgICAgaWYgKHZz LT52c3NhcGktPmV2YWx1YXRlQnVmZmVyKHZzc19zdGF0ZS0+dnNzLCBidWYsIHMtPnVybCkp IHsKKyAgICAgICAgY29uc3QgY2hhciAqbXNnID0gdnMtPnZzc2FwaS0+Z2V0RXJyb3IodnNz X3N0YXRlLT52c3MpOwogICAgICAgICBhdl9sb2cocywgQVZfTE9HX0VSUk9SLCAiRmFpbGVk IHRvIHBhcnNlIHNjcmlwdDogJXNcbiIsIG1zZyA/IG1zZyA6ICIodW5rbm93bikiKTsKICAg ICAgICAgZXJyID0gQVZFUlJPUl9FWFRFUk5BTDsKICAgICAgICAgZ290byBkb25lOwogICAg IH0KIAotICAgIHZzLT52c2FwaSA9IHZzc2NyaXB0X2dldFZTQXBpKCk7Ci0gICAgdnMtPnZz Y29yZSA9IHZzc2NyaXB0X2dldENvcmUodnNzX3N0YXRlLT52c3MpOwotCi0gICAgdnMtPm91 dG5vZGUgPSB2c3NjcmlwdF9nZXRPdXRwdXQodnNzX3N0YXRlLT52c3MsIDApOworICAgIHZz LT5vdXRub2RlID0gdnMtPnZzc2FwaS0+Z2V0T3V0cHV0Tm9kZSh2c3Nfc3RhdGUtPnZzcywg MCk7CiAgICAgaWYgKCF2cy0+b3V0bm9kZSkgewogICAgICAgICBhdl9sb2cocywgQVZfTE9H X0VSUk9SLCAiQ291bGQgbm90IGdldCBzY3JpcHQgb3V0cHV0IG5vZGUuXG4iKTsKICAgICAg ICAgZXJyID0gQVZFUlJPUl9FWFRFUk5BTDsKQEAgLTI2MCw3ICsyNjIsNyBAQCBzdGF0aWMg YXZfY29sZCBpbnQgcmVhZF9oZWFkZXJfdnMoQVZGb3JtYXRDb250ZXh0ICpzKQogCiAgICAg aW5mbyA9IHZzLT52c2FwaS0+Z2V0VmlkZW9JbmZvKHZzLT5vdXRub2RlKTsKIAotICAgIGlm ICghaW5mby0+Zm9ybWF0IHx8ICFpbmZvLT53aWR0aCB8fCAhaW5mby0+aGVpZ2h0KSB7Cisg ICAgaWYgKCFpbmZvLT5mb3JtYXQuY29sb3JGYW1pbHkgfHwgIWluZm8tPndpZHRoIHx8ICFp bmZvLT5oZWlnaHQpIHsKICAgICAgICAgYXZfbG9nKHMsIEFWX0xPR19FUlJPUiwgIk5vbi1j b25zdGFudCBpbnB1dCBmb3JtYXQgbm90IHN1cHBvcnRlZC5cbiIpOwogICAgICAgICBlcnIg PSBBVkVSUk9SX1BBVENIV0VMQ09NRTsKICAgICAgICAgZ290byBkb25lOwpAQCAtMjgwLDE5 ICsyODIsMTggQEAgc3RhdGljIGF2X2NvbGQgaW50IHJlYWRfaGVhZGVyX3ZzKEFWRm9ybWF0 Q29udGV4dCAqcykKICAgICBzdC0+Y29kZWNwYXItPmNvZGVjX2lkID0gQVZfQ09ERUNfSURf V1JBUFBFRF9BVkZSQU1FOwogICAgIHN0LT5jb2RlY3Bhci0+d2lkdGggPSBpbmZvLT53aWR0 aDsKICAgICBzdC0+Y29kZWNwYXItPmhlaWdodCA9IGluZm8tPmhlaWdodDsKLSAgICBzdC0+ Y29kZWNwYXItPmZvcm1hdCA9IG1hdGNoX3BpeGZtdChpbmZvLT5mb3JtYXQsIHZzLT5jX29y ZGVyKTsKKyAgICBzdC0+Y29kZWNwYXItPmZvcm1hdCA9IG1hdGNoX3BpeGZtdCgmaW5mby0+ Zm9ybWF0LCB2cy0+Y19vcmRlcik7CiAKICAgICBpZiAoc3QtPmNvZGVjcGFyLT5mb3JtYXQg PT0gQVZfUElYX0ZNVF9OT05FKSB7Ci0gICAgICAgIGF2X2xvZyhzLCBBVl9MT0dfRVJST1Is ICJVbnN1cHBvcnRlZCBWUyBwaXhlbCBmb3JtYXQgJXNcbiIsIGluZm8tPmZvcm1hdC0+bmFt ZSk7CisgICAgICAgIGF2X2xvZyhzLCBBVl9MT0dfRVJST1IsICJVbnN1cHBvcnRlZCBWUyBw aXhlbCBmb3JtYXQgJXNcbiIsCisgICAgICAgICAgICAgICB2cy0+dnNhcGktPmdldFZpZGVv Rm9ybWF0TmFtZSgmaW5mby0+Zm9ybWF0LCB2c2ZtdCkgPyB2c2ZtdCA6ICIodW5rbm93biki KTsKICAgICAgICAgZXJyID0gQVZFUlJPUl9FWFRFUk5BTDsKICAgICAgICAgZ290byBkb25l OwogICAgIH0KLSAgICBhdl9sb2cocywgQVZfTE9HX1ZFUkJPU0UsICJWUyBmb3JtYXQgJXMg LT4gcGl4Zm10ICVzXG4iLCBpbmZvLT5mb3JtYXQtPm5hbWUsCisgICAgYXZfbG9nKHMsIEFW X0xPR19WRVJCT1NFLCAiVlMgZm9ybWF0ICVzIC0+IHBpeGZtdCAlc1xuIiwKKyAgICAgICAg ICAgdnMtPnZzYXBpLT5nZXRWaWRlb0Zvcm1hdE5hbWUoJmluZm8tPmZvcm1hdCwgdnNmbXQp ID8gdnNmbXQgOiAiKHVua25vd24pIiwKICAgICAgICAgICAgYXZfZ2V0X3BpeF9mbXRfbmFt ZShzdC0+Y29kZWNwYXItPmZvcm1hdCkpOwogCi0gICAgaWYgKGluZm8tPmZvcm1hdC0+Y29s b3JGYW1pbHkgPT0gY21ZQ29DZykKLSAgICAgICAgc3QtPmNvZGVjcGFyLT5jb2xvcl9zcGFj ZSA9IEFWQ09MX1NQQ19ZQ0dDTzsKLQogZG9uZToKICAgICBhdl9mcmVlKGJ1Zik7CiAgICAg cmV0dXJuIGVycjsKQEAgLTMxMSwxMyArMzEyLDEzIEBAIHN0YXRpYyBpbnQgZ2V0X3ZzX3By b3BfaW50KEFWRm9ybWF0Q29udGV4dCAqcywgY29uc3QgVlNNYXAgKm1hcCwgY29uc3QgY2hh ciAqbmFtCiAgICAgaW50NjRfdCByZXM7CiAgICAgaW50IGVyciA9IDE7CiAKLSAgICByZXMg PSB2cy0+dnNhcGktPnByb3BHZXRJbnQobWFwLCBuYW1lLCAwLCAmZXJyKTsKKyAgICByZXMg PSB2cy0+dnNhcGktPm1hcEdldEludChtYXAsIG5hbWUsIDAsICZlcnIpOwogICAgIHJldHVy biBlcnIgfHwgcmVzIDwgSU5UX01JTiB8fCByZXMgPiBJTlRfTUFYID8gZGVmIDogcmVzOwog fQogCiBzdHJ1Y3QgdnNmcmFtZV9yZWZfZGF0YSB7CiAgICAgY29uc3QgVlNBUEkgKnZzYXBp OwotICAgIGNvbnN0IFZTRnJhbWVSZWYgKmZyYW1lOworICAgIGNvbnN0IFZTRnJhbWUgKmZy YW1lOwogICAgIEFWQnVmZmVyUmVmICp2c3Nfc3RhdGU7CiB9OwogCkBAIC0zMzksNyArMzQw LDcgQEAgc3RhdGljIGludCByZWFkX3BhY2tldF92cyhBVkZvcm1hdENvbnRleHQgKnMsIEFW UGFja2V0ICpwa3QpCiAgICAgQVZTdHJlYW0gKnN0ID0gcy0+c3RyZWFtc1swXTsKICAgICBB VkZyYW1lICpmcmFtZSA9IE5VTEw7CiAgICAgY2hhciB2c2Vycls4MF07Ci0gICAgY29uc3Qg VlNGcmFtZVJlZiAqdnNmcmFtZTsKKyAgICBjb25zdCBWU0ZyYW1lICp2c2ZyYW1lOwogICAg IGNvbnN0IFZTVmlkZW9JbmZvICppbmZvID0gdnMtPnZzYXBpLT5nZXRWaWRlb0luZm8odnMt Pm91dG5vZGUpOwogICAgIGNvbnN0IFZTTWFwICpwcm9wczsKICAgICBjb25zdCBBVlBpeEZt dERlc2NyaXB0b3IgKmRlc2M7CkBAIC0zODEsNyArMzgyLDcgQEAgc3RhdGljIGludCByZWFk X3BhY2tldF92cyhBVkZvcm1hdENvbnRleHQgKnMsIEFWUGFja2V0ICpwa3QpCiAgICAgICAg IGdvdG8gZW5kOwogICAgIH0KIAotICAgIHByb3BzID0gdnMtPnZzYXBpLT5nZXRGcmFtZVBy b3BzUk8odnNmcmFtZSk7CisgICAgcHJvcHMgPSB2cy0+dnNhcGktPmdldEZyYW1lUHJvcGVy dGllc1JPKHZzZnJhbWUpOwogCiAgICAgZnJhbWUgPSBhdl9mcmFtZV9hbGxvYygpOwogICAg IGlmICghZnJhbWUpIHsKQEAgLTQxMCw3ICs0MTEsNyBAQCBzdGF0aWMgaW50IHJlYWRfcGFj a2V0X3ZzKEFWRm9ybWF0Q29udGV4dCAqcywgQVZQYWNrZXQgKnBrdCkKIAogICAgIGRlc2Mg PSBhdl9waXhfZm10X2Rlc2NfZ2V0KGZyYW1lLT5mb3JtYXQpOwogCi0gICAgZm9yIChpID0g MDsgaSA8IGluZm8tPmZvcm1hdC0+bnVtUGxhbmVzOyBpKyspIHsKKyAgICBmb3IgKGkgPSAw OyBpIDwgaW5mby0+Zm9ybWF0Lm51bVBsYW5lczsgaSsrKSB7CiAgICAgICAgIGludCBwID0g dnMtPmNfb3JkZXJbaV07CiAgICAgICAgIHB0cmRpZmZfdCBwbGFuZV9oID0gZnJhbWUtPmhl aWdodDsKIAotLSAKMi4zNC4xCgo= --------------91gm69m08i3e4GsoPMN9WISs Content-Type: text/plain; charset=UTF-8; name="test.vpy" Content-Disposition: attachment; filename="test.vpy" Content-Transfer-Encoding: base64 aW1wb3J0IHZhcG91cnN5bnRoIGFzIHZzCmNvcmUgPSB2cy5jb3JlCmEgPSBjb3JlLnN0ZC5C bGFua0NsaXAod2lkdGg9NjQwLGhlaWdodD00ODAsbGVuZ3RoPTEwKQpiID0gY29yZS5zdGQu QmxhbmtDbGlwKHdpZHRoPTY0MCxoZWlnaHQ9NDgwLGxlbmd0aD0xMCxjb2xvcj1bMjU1LCAg IDAsICAgMF0pCmMgPSBjb3JlLnN0ZC5CbGFua0NsaXAod2lkdGg9NjQwLGhlaWdodD00ODAs bGVuZ3RoPTEwLGNvbG9yPVsgIDAsIDI1NSwgICAwXSkKZCA9IGNvcmUuc3RkLkJsYW5rQ2xp cCh3aWR0aD02NDAsaGVpZ2h0PTQ4MCxsZW5ndGg9MTAsY29sb3I9WyAgMCwgICAwLCAyNTVd KQpyID0gYSArIGIgKyBjICsgZApyLnNldF9vdXRwdXQoMCkK --------------91gm69m08i3e4GsoPMN9WISs 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". --------------91gm69m08i3e4GsoPMN9WISs--