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 5CC9046FCE for ; Tue, 23 Jul 2024 14:51:59 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 52E6C68D477; Tue, 23 Jul 2024 17:51:57 +0300 (EEST) Received: from mout.gmx.net (mout.gmx.net [212.227.17.22]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 53B9168D409 for ; Tue, 23 Jul 2024 17:51:50 +0300 (EEST) X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a Received: from [192.168.11.12] ([91.248.195.76]) by mail.gmx.net (mrgmx104 [212.227.17.168]) with ESMTPSA (Nemesis) id 1MNbox-1sgOpq1n6h-00T94w for ; Tue, 23 Jul 2024 16:51:49 +0200 Content-Type: multipart/mixed; boundary="------------QQyGRnCkwBgLa0cQI0aC0fac" Message-ID: Date: Tue, 23 Jul 2024 16:51:49 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird To: ffmpeg-devel@ffmpeg.org Content-Language: de-DE, en-US X-Provags-ID: V03:K1:MAs+2PoFYszKsgAB7AWwJNK+NFQ0/QMAb6qiZVXaI9RqnlpjP7+ sVz8NC+m7zsI1iOd2OM27LzBiz+TPWo62q2wBAGa7dCIQ5+qYEfwKd0nGYDq1Sgn3HKgbDi v3C/O+gO645wtVGsbI3n/1FhBL5ZSlucA7po+c9VAYgOwFhKV19XPOuH/lNuGU03eUy/TPl x4/RflXGysE+qWwR5Cc9Q== X-Spam-Flag: NO UI-OutboundReport: notjunk:1;M01:P0:etEL92messc=;UD5x3xEjiZD26PdbGA9rMzN/0Cd +3USSB8cAJmn3ocPH2afgRggypriw/U+9D7OT1lwno0amTDkMVibttTD+lumH/Q5t5NG6C2F4 wWwCeuCC8Nswr7XT3mIKb6lxflJ6tHwD/yofQGAuwUbE03G1R+iX/9ut4cym+/f2Ja13Ujmkk msZVm0K4P7qz/DF+jWhQDDC+e1890NL+uUAtYNGF9kMz+l82XNIP0xYznHu4w0iC9jfc+Tvr7 KaXb9hMK5gdOv0eA+D49rknSlqZqt7XkRs4xcgtcBNGI1easJKTwlaM0pl1DGqYdD0kBCY5OD TdYPwareQNGdH4b/V8eIJXtz0bs5PDZqo9D6T3zp8bXwgMj5QGTwP8JYPZbgReApjhaeWWkWn QOH2bYVexqOakzak8NM+MVIUksMB6fLsWnlqTmJOLHi0lF0OEq2n6uTgJ5guU9Yj4sig/o3h+ e8yyIZifiU/WCXyH7ARRZGtTVP0PyKVQtNsi8gYYPH40qjMryZAJR15SxwaSedeIuxNP0+SEq /ZJbeHCnSL5YwQAxkqkH5uzEFJIFL8JMfceT6xM2U2goqqsV/U/l7vwNX0he8XC6UMjk0CPct 5Oyw6eFkbgAyexItHaAhoosnACk3R/dS8RTtePSRQ538mMZB0TuzFryLV1cPc4edDUpjBCNyf fCpqdvl/er5kq4qAOusXKxAWtceV29y9G/oRR6uuMWlAtQnUqgifffWfI8VzmeJqFuq8sjot2 Ig+cCHq68woDpvkmGyA4kqQ6gn1rO9VCzj9i0rokUNmQBRjoXTQo4NT0dkJwS4RZkUYlXLvxo n9yeOR7ahW/glL8ZtYAhT31Q== Subject: [FFmpeg-devel] [PATCH v3 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. --------------QQyGRnCkwBgLa0cQI0aC0fac Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: quoted-printable Hello, this is revised patch, this is the first part that just updates to the API v4 of VapourSynth. Changes in API v4: -All functions previously in header are now part of the "vssapi" object -Renames of different types and functions -YCoCg is not treated as different format to YUV anymore -Some pointers to arrays are now arrays inside a struct. Best regards Stefan --------------QQyGRnCkwBgLa0cQI0aC0fac 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 RnJvbSAxNjRhNDQwZmZiYjU5NTFjYTM4YmZmZjU2ZTdiNjJiZDY3N2QxZjUyIE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBTdGVmYW4gT2x0bWFubnMgPHN0ZWZhbi1vbHRtYW5u c0BnbXgubmV0PgpEYXRlOiBUdWUsIDIzIEp1bCAyMDI0IDE2OjE1OjM2ICswMjAwClN1Ympl Y3Q6IFtQQVRDSCAxLzJdIGF2Zm9ybWF0L3ZhcG91cnN5bnRoOiBVcGRhdGUgdG8gQVBJIHZl cnNpb24gNAoKU2lnbmVkLW9mZi1ieTogU3RlZmFuIE9sdG1hbm5zIDxzdGVmYW4tb2x0bWFu bnNAZ214Lm5ldD4KLS0tCiBjb25maWd1cmUgICAgICAgICAgICAgICAgIHwgIDIgKy0KIGxp YmF2Zm9ybWF0L3ZhcG91cnN5bnRoLmMgfCA4NCArKysrKysrKysrKysrKysrKysrKystLS0t LS0tLS0tLS0tLS0tLS0KIDIgZmlsZXMgY2hhbmdlZCwgNDYgaW5zZXJ0aW9ucygrKSwgNDAg ZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvY29uZmlndXJlIGIvY29uZmlndXJlCmluZGV4 IGY2ZjVjMjlmZWEuLmM1MGI1YWQ0YjQgMTAwNzU1Ci0tLSBhL2NvbmZpZ3VyZQorKysgYi9j b25maWd1cmUKQEAgLTcwODUsNyArNzA4NSw3IEBAIGVuYWJsZWQgcmttcHAgICAgICAgICAg ICAgJiYgeyByZXF1aXJlX3BrZ19jb25maWcgcmttcHAgcm9ja2NoaXBfbXBwICByb2NrY2hp cC9yCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgeyBlbmFibGVkIGxpYmRybSB8 fAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZGllICJFUlJPUjogcmttcHAg cmVxdWlyZXMgLS1lbmFibGUtbGliZHJtIjsgfQogICAgICAgICAgICAgICAgICAgICAgICAg ICAgICB9Ci1lbmFibGVkIHZhcG91cnN5bnRoICAgICAgICYmIHJlcXVpcmVfcGtnX2NvbmZp ZyB2YXBvdXJzeW50aCAidmFwb3Vyc3ludGgtc2NyaXB0ID49IDQyIiBWU1NjcmlwdC5oIHZz c2NyaXB0X2luaXQKK2VuYWJsZWQgdmFwb3Vyc3ludGggICAgICAgJiYgcmVxdWlyZV9wa2df Y29uZmlnIHZhcG91cnN5bnRoICJ2YXBvdXJzeW50aC1zY3JpcHQgPj0gNTUiIFZTU2NyaXB0 NC5oIGdldFZTU2NyaXB0QVBJCiAKIAogaWYgZW5hYmxlZCBnY3J5cHQ7IHRoZW4KZGlmZiAt LWdpdCBhL2xpYmF2Zm9ybWF0L3ZhcG91cnN5bnRoLmMgYi9saWJhdmZvcm1hdC92YXBvdXJz eW50aC5jCmluZGV4IDhhMjUxOWUxOWEuLmNlMTVmNjgxODAgMTAwNjQ0Ci0tLSBhL2xpYmF2 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 PSBBVkVSUk9SX1BBVENIV0VMQ09NRTsKICAgICAgICAgZ290byBkb25lOwpAQCAtMjgwLDE4 ICsyODIsMjIgQEAgc3RhdGljIGF2X2NvbGQgaW50IHJlYWRfaGVhZGVyX3ZzKEFWRm9ybWF0 Q29udGV4dCAqcykKICAgICBzdC0+Y29kZWNwYXItPmNvZGVjX2lkID0gQVZfQ09ERUNfSURf V1JBUFBFRF9BVkZSQU1FOwogICAgIHN0LT5jb2RlY3Bhci0+d2lkdGggPSBpbmZvLT53aWR0 aDsKICAgICBzdC0+Y29kZWNwYXItPmhlaWdodCA9IGluZm8tPmhlaWdodDsKLSAgICBzdC0+ Y29kZWNwYXItPmZvcm1hdCA9IG1hdGNoX3BpeGZtdChpbmZvLT5mb3JtYXQsIHZzLT5jX29y ZGVyKTsKKyAgICBzdC0+Y29kZWNwYXItPmZvcm1hdCA9IG1hdGNoX3BpeGZtdCgmaW5mby0+ Zm9ybWF0LCB2cy0+Y19vcmRlcik7CiAKICAgICBpZiAoc3QtPmNvZGVjcGFyLT5mb3JtYXQg PT0gQVZfUElYX0ZNVF9OT05FKSB7Ci0gICAgICAgIGF2X2xvZyhzLCBBVl9MT0dfRVJST1Is ICJVbnN1cHBvcnRlZCBWUyBwaXhlbCBmb3JtYXQgJXNcbiIsIGluZm8tPmZvcm1hdC0+bmFt ZSk7CisgICAgICAgIGlmKHZzLT52c2FwaS0+Z2V0VmlkZW9Gb3JtYXROYW1lKCZpbmZvLT5m b3JtYXQsIHZzZm10KSkKKyAgICAgICAgICAgIGF2X2xvZyhzLCBBVl9MT0dfRVJST1IsICJV bnN1cHBvcnRlZCBWUyBwaXhlbCBmb3JtYXQgJXNcbiIsIHZzZm10KTsKKyAgICAgICAgZWxz ZQorICAgICAgICAgICAgYXZfbG9nKHMsIEFWX0xPR19FUlJPUiwgIlVuc3VwcG9ydGVkIFZT IHBpeGVsIGZvcm1hdFxuIik7CiAgICAgICAgIGVyciA9IEFWRVJST1JfRVhURVJOQUw7CiAg ICAgICAgIGdvdG8gZG9uZTsKICAgICB9Ci0gICAgYXZfbG9nKHMsIEFWX0xPR19WRVJCT1NF LCAiVlMgZm9ybWF0ICVzIC0+IHBpeGZtdCAlc1xuIiwgaW5mby0+Zm9ybWF0LT5uYW1lLAot ICAgICAgICAgICBhdl9nZXRfcGl4X2ZtdF9uYW1lKHN0LT5jb2RlY3Bhci0+Zm9ybWF0KSk7 Ci0KLSAgICBpZiAoaW5mby0+Zm9ybWF0LT5jb2xvckZhbWlseSA9PSBjbVlDb0NnKQotICAg ICAgICBzdC0+Y29kZWNwYXItPmNvbG9yX3NwYWNlID0gQVZDT0xfU1BDX1lDR0NPOworICAg IGlmICh2cy0+dnNhcGktPmdldFZpZGVvRm9ybWF0TmFtZSgmaW5mby0+Zm9ybWF0LCB2c2Zt dCkpCisgICAgICAgIGF2X2xvZyhzLCBBVl9MT0dfVkVSQk9TRSwgIlZTIGZvcm1hdCAlcyAt PiBwaXhmbXQgJXNcbiIsCisgICAgICAgICAgICAgICB2c2ZtdCwgYXZfZ2V0X3BpeF9mbXRf bmFtZShzdC0+Y29kZWNwYXItPmZvcm1hdCkpOworICAgIGVsc2UKKyAgICAgICAgYXZfbG9n KHMsIEFWX0xPR19WRVJCT1NFLCAiVlMgZm9ybWF0IC0+IHBpeGZtdCAlc1xuIiwKKyAgICAg ICAgICAgICAgIGF2X2dldF9waXhfZm10X25hbWUoc3QtPmNvZGVjcGFyLT5mb3JtYXQpKTsK IAogZG9uZToKICAgICBhdl9mcmVlKGJ1Zik7CkBAIC0zMTEsMTMgKzMxNywxMyBAQCBzdGF0 aWMgaW50IGdldF92c19wcm9wX2ludChBVkZvcm1hdENvbnRleHQgKnMsIGNvbnN0IFZTTWFw ICptYXAsIGNvbnN0IGNoYXIgKm5hbQogICAgIGludDY0X3QgcmVzOwogICAgIGludCBlcnIg PSAxOwogCi0gICAgcmVzID0gdnMtPnZzYXBpLT5wcm9wR2V0SW50KG1hcCwgbmFtZSwgMCwg JmVycik7CisgICAgcmVzID0gdnMtPnZzYXBpLT5tYXBHZXRJbnQobWFwLCBuYW1lLCAwLCAm ZXJyKTsKICAgICByZXR1cm4gZXJyIHx8IHJlcyA8IElOVF9NSU4gfHwgcmVzID4gSU5UX01B WCA/IGRlZiA6IHJlczsKIH0KIAogc3RydWN0IHZzZnJhbWVfcmVmX2RhdGEgewogICAgIGNv bnN0IFZTQVBJICp2c2FwaTsKLSAgICBjb25zdCBWU0ZyYW1lUmVmICpmcmFtZTsKKyAgICBj b25zdCBWU0ZyYW1lICpmcmFtZTsKICAgICBBVkJ1ZmZlclJlZiAqdnNzX3N0YXRlOwogfTsK IApAQCAtMzM5LDcgKzM0NSw3IEBAIHN0YXRpYyBpbnQgcmVhZF9wYWNrZXRfdnMoQVZGb3Jt YXRDb250ZXh0ICpzLCBBVlBhY2tldCAqcGt0KQogICAgIEFWU3RyZWFtICpzdCA9IHMtPnN0 cmVhbXNbMF07CiAgICAgQVZGcmFtZSAqZnJhbWUgPSBOVUxMOwogICAgIGNoYXIgdnNlcnJb ODBdOwotICAgIGNvbnN0IFZTRnJhbWVSZWYgKnZzZnJhbWU7CisgICAgY29uc3QgVlNGcmFt ZSAqdnNmcmFtZTsKICAgICBjb25zdCBWU1ZpZGVvSW5mbyAqaW5mbyA9IHZzLT52c2FwaS0+ Z2V0VmlkZW9JbmZvKHZzLT5vdXRub2RlKTsKICAgICBjb25zdCBWU01hcCAqcHJvcHM7CiAg ICAgY29uc3QgQVZQaXhGbXREZXNjcmlwdG9yICpkZXNjOwpAQCAtMzgxLDcgKzM4Nyw3IEBA IHN0YXRpYyBpbnQgcmVhZF9wYWNrZXRfdnMoQVZGb3JtYXRDb250ZXh0ICpzLCBBVlBhY2tl dCAqcGt0KQogICAgICAgICBnb3RvIGVuZDsKICAgICB9CiAKLSAgICBwcm9wcyA9IHZzLT52 c2FwaS0+Z2V0RnJhbWVQcm9wc1JPKHZzZnJhbWUpOworICAgIHByb3BzID0gdnMtPnZzYXBp LT5nZXRGcmFtZVByb3BlcnRpZXNSTyh2c2ZyYW1lKTsKIAogICAgIGZyYW1lID0gYXZfZnJh bWVfYWxsb2MoKTsKICAgICBpZiAoIWZyYW1lKSB7CkBAIC00MTAsNyArNDE2LDcgQEAgc3Rh dGljIGludCByZWFkX3BhY2tldF92cyhBVkZvcm1hdENvbnRleHQgKnMsIEFWUGFja2V0ICpw a3QpCiAKICAgICBkZXNjID0gYXZfcGl4X2ZtdF9kZXNjX2dldChmcmFtZS0+Zm9ybWF0KTsK IAotICAgIGZvciAoaSA9IDA7IGkgPCBpbmZvLT5mb3JtYXQtPm51bVBsYW5lczsgaSsrKSB7 CisgICAgZm9yIChpID0gMDsgaSA8IGluZm8tPmZvcm1hdC5udW1QbGFuZXM7IGkrKykgewog ICAgICAgICBpbnQgcCA9IHZzLT5jX29yZGVyW2ldOwogICAgICAgICBwdHJkaWZmX3QgcGxh bmVfaCA9IGZyYW1lLT5oZWlnaHQ7CiAKLS0gCjIuMzQuMQoK --------------QQyGRnCkwBgLa0cQI0aC0fac 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". --------------QQyGRnCkwBgLa0cQI0aC0fac--