Re: [PATCH] Try to adapt to recent compilers such as GCC 14
KO Myung-Hun <[email protected]> Wed, 02 Oct 2024 21:09:26 +0900
| Newsgroups | gmane.comp.video.mplayer.devel |
|---|---|
| Message-ID | <[email protected]> |
This is a multi-part message in MIME format. --------------070505040805090405080405 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit Hi/2. Ingo Brückl wrote: > Lorenzo wrote on Tue, 1 Oct 2024 14:25:54 +0200: > >> On Tue, 01 Oct 2024 14:13:36 +0200 >> Ingo Brückl <[email protected]> wrote: > >>> Lorenzo wrote on Tue, 1 Oct 2024 12:52:48 +0200: >>> >>>> with this patch applied it still fails[1] to build on i386 (Debian) >>>> for me, with >>> >>>> 73 | if (iconv(inv_msgiconv, (const char **)&filename, &filename_len, >>>> | ^~~~~~~~~~~~~~~~~~~~~~~~ >>>> | | >>>> | const char ** >>> >>> Which patch? It's okay in current svn. > >> Apologies, I was not subscribed so I just copied the subject without a >> proper quote; the patch posted in >> https://lists.mplayerhq.hu/pipermail/mplayer-dev-eng/2024-September/074217.html > > This patch is broken regarding all (const char **) casts for iconv() > which takes char ** as a second argument. > Hmm... OS/2 iconv() has `const' qualifier. Anyway I've attached the fixed patch. -- KO Myung-Hun Korean OS/2 User Community : https://www.os2.kr/ --------------070505040805090405080405 Content-Type: application/x-patch; name="v2-0001-Try-to-adapt-to-recent-compilers-such-as-GCC-14.patch" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename*0="v2-0001-Try-to-adapt-to-recent-compilers-such-as-GCC-14.patc"; filename*1="h" RnJvbSBiYzM1YjEyZGVmNDM1NjU1NGE2NDM0YWYxMjlhNGRkMWJjNDY4NGViIE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBLTyBNeXVuZy1IdW4gPGtvbWg3OEBnbWFpbC5jb20+ CkRhdGU6IFNhdCwgMjggU2VwIDIwMjQgMjI6MTc6MTIgKzA5MDAKU3ViamVjdDogW1BBVENI IHYyXSBUcnkgdG8gYWRhcHQgdG8gcmVjZW50IGNvbXBpbGVycyBzdWNoIGFzIEdDQyAxNAoK UmVjZW50IGNvbXBpbGVycyBzdWNoIGFzIEdDQyAxNCBnZW5lcmF0ZSBlcnJvcnMgZm9yIGlt cGxpY2l0IGNhc3RzLgotLS0KIGNvbmZpZ3VyZSAgICAgICAgICAgICAgICAgICAgICB8ICAy ICstCiBsaWJtcGNvZGVjcy92ZF9xdHZpZGVvLmMgICAgICAgfCAgMiArLQogbGlidm8vdm9f a3ZhLmMgICAgICAgICAgICAgICAgIHwgIDQgKystLQogbG9hZGVyL2FmbC5jICAgICAgICAg ICAgICAgICAgIHwgIDIgKy0KIGxvYWRlci9kc2hvdy9EU19GaWx0ZXIuYyAgICAgICB8ICA0 ICsrLS0KIGxvYWRlci9kc2hvdy9EU19WaWRlb0RlY29kZXIuYyB8ICA0ICsrLS0KIGxvYWRl ci9kc2hvdy9ncmFwaC5jICAgICAgICAgICB8IDE2ICsrKysrKysrLS0tLS0tLS0KIGxvYWRl ci9leHQuYyAgICAgICAgICAgICAgICAgICB8ICAyICstCiBsb2FkZXIvbW9kdWxlLmMgICAg ICAgICAgICAgICAgfCAgNCArKy0tCiBsb2FkZXIvd2luMzIuYyAgICAgICAgICAgICAgICAg fCAyMSArKysrKysrKysrKy0tLS0tLS0tLS0KIG1wX21zZy5jICAgICAgICAgICAgICAgICAg ICAgICB8ICA0ICsrLS0KIHN0cmVhbS9hc2ZfbW1zdF9zdHJlYW1pbmcuYyAgICB8ICAyICst CiBzdWIvZm9udF9sb2FkX2Z0LmMgICAgICAgICAgICAgfCAgMiArLQogc3ViL3N1YnJlYWRl ci5jICAgICAgICAgICAgICAgIHwgIDIgKy0KIDE0IGZpbGVzIGNoYW5nZWQsIDM2IGluc2Vy dGlvbnMoKyksIDM1IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2NvbmZpZ3VyZSBiL2Nv bmZpZ3VyZQppbmRleCA3NTNlMTQ0NDYuLmM1YWFjOGJkNCAxMDA3NTUKLS0tIGEvY29uZmln dXJlCisrKyBiL2NvbmZpZ3VyZQpAQCAtNDQzNiw3ICs0NDM2LDcgQEAgaW50IG1haW4odm9p ZCkgewogICAgICAgY2hhciAqb3B0cj1vdXRidWZmZXI7CiAgICAgICBzaXplX3QgaW5sZWZ0 PW51bXJlYWQ7CiAgICAgICBzaXplX3Qgb3V0bGVmdD1PVVRCVUZTSVpFOwotICAgICAgaWYg KGljb252KGljZHNjLCAmaXB0ciwgJmlubGVmdCwgJm9wdHIsICZvdXRsZWZ0KQorICAgICAg aWYgKGljb252KGljZHNjLCAodm9pZCAqKSZpcHRyLCAmaW5sZWZ0LCAmb3B0ciwgJm91dGxl ZnQpCiAgICAgICAgICAgIT0gKHNpemVfdCkoLTEpKSB7CiAgICAgICAgIHdyaXRlKDEsIG91 dGJ1ZmZlciwgT1VUQlVGU0laRSAtIG91dGxlZnQpOwogICAgICAgfQpkaWZmIC0tZ2l0IGEv bGlibXBjb2RlY3MvdmRfcXR2aWRlby5jIGIvbGlibXBjb2RlY3MvdmRfcXR2aWRlby5jCmlu ZGV4IGQzZGJlYWNjNC4uNWUzN2NhNDU2IDEwMDY0NAotLS0gYS9saWJtcGNvZGVjcy92ZF9x dHZpZGVvLmMKKysrIGIvbGlibXBjb2RlY3MvdmRfcXR2aWRlby5jCkBAIC0xMjksNyArMTI5 LDcgQEAgc3RhdGljIGludCBpbml0KHNoX3ZpZGVvX3QgKnNoKXsKICAgICBEZWNvbXByZXNz U2VxdWVuY2VGcmFtZVMgPSAoT1NFcnIgKCopKEltYWdlU2VxdWVuY2UsUHRyLGxvbmcsQ29k ZWNGbGFncyxDb2RlY0ZsYWdzKixJQ01Db21wbGV0aW9uUHJvY1JlY29yZFB0cikpR2V0UHJv Y0FkZHJlc3MoaGFuZGxlciwgIkRlY29tcHJlc3NTZXF1ZW5jZUZyYW1lUyIpOwogICAgIEdl dEdXb3JsZFBpeE1hcCA9IChQaXhNYXBIYW5kbGUgKCopKEdXb3JsZFB0cikpR2V0UHJvY0Fk ZHJlc3MoaGFuZGxlciwgIkdldEdXb3JsZFBpeE1hcCIpOwogICAgIFFUTmV3R1dvcmxkRnJv bVB0ciA9IChPU0VycigqKShHV29ybGRQdHIgKixPU1R5cGUsY29uc3QgUmVjdCAqLENUYWJI YW5kbGUsdm9pZCosR1dvcmxkRmxhZ3Msdm9pZCAqLGxvbmcpKUdldFByb2NBZGRyZXNzKGhh bmRsZXIsICJRVE5ld0dXb3JsZEZyb21QdHIiKTsKLSAgICBOZXdIYW5kbGVDbGVhciA9IChP U0VycigqKShTaXplKSlHZXRQcm9jQWRkcmVzcyhoYW5kbGVyLCAiTmV3SGFuZGxlQ2xlYXIi KTsKKyAgICBOZXdIYW5kbGVDbGVhciA9IChIYW5kbGUoKikoU2l6ZSkpR2V0UHJvY0FkZHJl c3MoaGFuZGxlciwgIk5ld0hhbmRsZUNsZWFyIik7CiAgICAgRGlzcG9zZUhhbmRsZSA9ICh2 b2lkICgqKShIYW5kbGUpKUdldFByb2NBZGRyZXNzKGhhbmRsZXIsICJEaXNwb3NlSGFuZGxl Iik7CiAgICAgRGlzcG9zZUdXb3JsZCA9ICh2b2lkICgqKShHV29ybGRQdHIpKUdldFByb2NB ZGRyZXNzKGhhbmRsZXIsICJEaXNwb3NlR1dvcmxkIik7CiAgICAgQ0RTZXF1ZW5jZUVuZCA9 IChPU0VyciAoKikoSW1hZ2VTZXF1ZW5jZSkpR2V0UHJvY0FkZHJlc3MoaGFuZGxlciwgIkNE U2VxdWVuY2VFbmQiKTsKZGlmZiAtLWdpdCBhL2xpYnZvL3ZvX2t2YS5jIGIvbGlidm8vdm9f a3ZhLmMKaW5kZXggNDJiMjczZGQ3Li5jMTBmYmQyOTEgMTAwNjQ0Ci0tLSBhL2xpYnZvL3Zv X2t2YS5jCisrKyBiL2xpYnZvL3ZvX2t2YS5jCkBAIC0zMTksOCArMzE5LDggQEAgc3RhdGlj IHZvaWQgaW1nRGlzcGxheSh2b2lkKQogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IGRzdFN0cmlkZVsyXSwgbV9pbnQuc3RyaWRlWzJdKTsKICAgICAgICAgICAgIH0KICAgICAg ICAgfSBlbHNlIHsKLSAgICAgICAgICAgIHN3c19zY2FsZShtX2ludC5zd3MsIG1faW50LnBs YW5lcywgbV9pbnQuc3RyaWRlLCAwLCBTUkNfSEVJR0hULAotICAgICAgICAgICAgICAgICAg ICAgIGRzdCwgZHN0U3RyaWRlKTsKKyAgICAgICAgICAgIHN3c19zY2FsZShtX2ludC5zd3Ms IChjb25zdCB1aW50OF90ICogY29uc3QgKiltX2ludC5wbGFuZXMsCisgICAgICAgICAgICAg ICAgICAgICAgbV9pbnQuc3RyaWRlLCAwLCBTUkNfSEVJR0hULCBkc3QsIGRzdFN0cmlkZSk7 CiAgICAgICAgIH0KIAogICAgICAgICBrdmFVbmxvY2tCdWZmZXIoKTsKZGlmZiAtLWdpdCBh L2xvYWRlci9hZmwuYyBiL2xvYWRlci9hZmwuYwppbmRleCAzMzdjYmNkNTUuLmIyOTQ3MWNk YyAxMDA2NDQKLS0tIGEvbG9hZGVyL2FmbC5jCisrKyBiL2xvYWRlci9hZmwuYwpAQCAtMjI3 LDcgKzIyNyw3IEBAIE1NUkVTVUxUIFdJTkFQSSBhY21Ecml2ZXJPcGVuKFBIQUNNRFJJVkVS IHBoYWQsIEhBQ01EUklWRVJJRCBoYWRpZCwgRFdPUkQgZmR3T3BlCiAJcmV0dXJuIE1NU1lT RVJSX0VSUk9SOwogICAgIH0KIAotICAgIHBhZC0+cGZuRHJpdmVyUHJvYyA9IEdldFByb2NB ZGRyZXNzKHBhZC0+aERydnIsICJEcml2ZXJQcm9jIik7CisgICAgcGFkLT5wZm5Ecml2ZXJQ cm9jID0gKERSSVZFUlBST0MpR2V0UHJvY0FkZHJlc3MocGFkLT5oRHJ2ciwgIkRyaXZlclBy b2MiKTsKIAogICAgIC8qIGluc2VydCBuZXcgcGFkIGF0IGJlZyBvZiBsaXN0ICovCiAgICAg cGFkLT5wTmV4dEFDTURyaXZlciA9IHBhZGlkLT5wQUNNRHJpdmVyTGlzdDsKZGlmZiAtLWdp dCBhL2xvYWRlci9kc2hvdy9EU19GaWx0ZXIuYyBiL2xvYWRlci9kc2hvdy9EU19GaWx0ZXIu YwppbmRleCA2OTNkNTljMjUuLjE3MGI0OTUzNyAxMDA2NDQKLS0tIGEvbG9hZGVyL2RzaG93 L0RTX0ZpbHRlci5jCisrKyBiL2xvYWRlci9kc2hvdy9EU19GaWx0ZXIuYwpAQCAtMjE2LDcg KzIxNiw3IEBAIERTX0ZpbHRlciogRFNfRmlsdGVyQ3JlYXRlKGNvbnN0IGNoYXIqIGRsbG5h bWUsIGNvbnN0IEdVSUQqIGlkLAogCiAJZW51bV9waW5zLT52dC0+UmVzZXQoZW51bV9waW5z KTsKIAlyZXN1bHQgPSBlbnVtX3BpbnMtPnZ0LT5OZXh0KGVudW1fcGlucywgKFVMT05HKTI1 NiwgKElQaW4qKilhcnJheSwgJmZldGNoZWQpOwotCWVudW1fcGlucy0+dnQtPlJlbGVhc2Uo ZW51bV9waW5zKTsKKwllbnVtX3BpbnMtPnZ0LT5SZWxlYXNlKChJVW5rbm93biAqKWVudW1f cGlucyk7CiAJRGVidWcgcHJpbnRmKCJQaW5zIGVudW1lcmF0aW9uIHJldHVybmVkICVsZCBw aW5zLCBlcnJvciBpcyAleFxuIiwgZmV0Y2hlZCwgKGludClyZXN1bHQpOwogCiAJZm9yIChp ID0gMDsgaSA8IGZldGNoZWQ7IGkrKykKQEAgLTMwNiw3ICszMDYsNyBAQCBEU19GaWx0ZXIq IERTX0ZpbHRlckNyZWF0ZShjb25zdCBjaGFyKiBkbGxuYW1lLCBjb25zdCBHVUlEKiBpZCwK IAlpbml0Kys7CiAgICAgICAgIGJyZWFrOwogICAgIH0KLSAgICB0ZW1wQWxsLT52dC0+UmVs ZWFzZSh0ZW1wQWxsKTsKKyAgICB0ZW1wQWxsLT52dC0+UmVsZWFzZSgoSVVua25vd24gKil0 ZW1wQWxsKTsKIAogICAgIGlmICghaW5pdCkKICAgICB7CmRpZmYgLS1naXQgYS9sb2FkZXIv ZHNob3cvRFNfVmlkZW9EZWNvZGVyLmMgYi9sb2FkZXIvZHNob3cvRFNfVmlkZW9EZWNvZGVy LmMKaW5kZXggZGQwMzk2ZjRmLi40NmRmZGU0MjYgMTAwNjQ0Ci0tLSBhL2xvYWRlci9kc2hv dy9EU19WaWRlb0RlY29kZXIuYworKysgYi9sb2FkZXIvZHNob3cvRFNfVmlkZW9EZWNvZGVy LmMKQEAgLTYwMSw4ICs2MDEsOCBAQCBpbnQgRFNfVmlkZW9EZWNvZGVyX1NldERlc3RGbXQo RFNfVmlkZW9EZWNvZGVyICp0aGlzLCBpbnQgYml0cywgdW5zaWduZWQgaW50IGNzcAogICAg IH0KIAogICAgIGlmKHRoaXMtPm1fcERTX0ZpbHRlci0+bV9wQWxsKQotICAgICAgICB0aGlz LT5tX3BEU19GaWx0ZXItPm1fcEFsbC0+dnQtPlJlbGVhc2UodGhpcy0+bV9wRFNfRmlsdGVy LT5tX3BBbGwpOwotICAgIHRoaXMtPm1fcERTX0ZpbHRlci0+bV9wQWxsPU1lbUFsbG9jYXRv ckNyZWF0ZSgpOworICAgICAgICB0aGlzLT5tX3BEU19GaWx0ZXItPm1fcEFsbC0+dnQtPlJl bGVhc2UoKElVbmtub3duICopdGhpcy0+bV9wRFNfRmlsdGVyLT5tX3BBbGwpOworICAgIHRo aXMtPm1fcERTX0ZpbHRlci0+bV9wQWxsPShJTWVtQWxsb2NhdG9yICopTWVtQWxsb2NhdG9y Q3JlYXRlKCk7CiAgICAgaWYgKCF0aGlzLT5tX3BEU19GaWx0ZXItPm1fcEFsbCkKICAgICB7 CiAgICAgICAgIHByaW50ZigiQ2FsbCB0byBNZW1BbGxvY2F0b3JDcmVhdGUgZmFpbGVkXG4i KTsKZGlmZiAtLWdpdCBhL2xvYWRlci9kc2hvdy9ncmFwaC5jIGIvbG9hZGVyL2RzaG93L2dy YXBoLmMKaW5kZXggMDFiZjZjNzI1Li5kYzgyZGM5M2MgMTAwNjQ0Ci0tLSBhL2xvYWRlci9k c2hvdy9ncmFwaC5jCisrKyBiL2xvYWRlci9kc2hvdy9ncmFwaC5jCkBAIC0xNDEsMTQgKzE0 MSwxNCBAQCBGaWx0ZXJHcmFwaCogRmlsdGVyR3JhcGhDcmVhdGUoKQogICAgIFRoaXMtPnZ0 LT5BZGRSZWYgICAgICAgICAgICAgICA9IEZpbHRlckdyYXBoX0FkZFJlZjsKICAgICBUaGlz LT52dC0+UmVsZWFzZSAgICAgICAgICAgICAgPSBGaWx0ZXJHcmFwaF9SZWxlYXNlOwogCi0g ICAgVGhpcy0+dnQtPkFkZEZpbHRlciAgICAgICAgICAgID0gRmlsdGVyR3JhcGhfQWRkRmls dGVyOwotICAgIFRoaXMtPnZ0LT5SZW1vdmVGaWx0ZXIgICAgICAgICA9IEZpbHRlckdyYXBo X1JlbW92ZUZpbHRlcjsKLSAgICBUaGlzLT52dC0+RW51bUZpbHRlcnMgICAgICAgICAgPSBG aWx0ZXJHcmFwaF9FbnVtRmlsdGVyczsKLSAgICBUaGlzLT52dC0+RmluZEZpbHRlckJ5TmFt ZSAgICAgPSBGaWx0ZXJHcmFwaF9GaW5kRmlsdGVyQnlOYW1lOwotICAgIFRoaXMtPnZ0LT5D b25uZWN0RGlyZWN0ICAgICAgICA9IEZpbHRlckdyYXBoX0Nvbm5lY3REaXJlY3Q7Ci0gICAg VGhpcy0+dnQtPlJlY29ubmVjdCAgICAgICAgICAgID0gRmlsdGVyR3JhcGhfUmVjb25uZWN0 OwotICAgIFRoaXMtPnZ0LT5EaXNjb25uZWN0ICAgICAgICAgICA9IEZpbHRlckdyYXBoX0Rp c2Nvbm5lY3Q7Ci0gICAgVGhpcy0+dnQtPlNldERlZmF1bHRTeW5jU291cmNlID0gRmlsdGVy R3JhcGhfU2V0RGVmYXVsdFN5bmNTb3VyY2U7CisgICAgVGhpcy0+dnQtPkFkZEZpbHRlciAg ICAgICAgICAgID0gKHZvaWQgKilGaWx0ZXJHcmFwaF9BZGRGaWx0ZXI7CisgICAgVGhpcy0+ dnQtPlJlbW92ZUZpbHRlciAgICAgICAgID0gKHZvaWQgKilGaWx0ZXJHcmFwaF9SZW1vdmVG aWx0ZXI7CisgICAgVGhpcy0+dnQtPkVudW1GaWx0ZXJzICAgICAgICAgID0gKHZvaWQgKilG aWx0ZXJHcmFwaF9FbnVtRmlsdGVyczsKKyAgICBUaGlzLT52dC0+RmluZEZpbHRlckJ5TmFt ZSAgICAgPSAodm9pZCAqKUZpbHRlckdyYXBoX0ZpbmRGaWx0ZXJCeU5hbWU7CisgICAgVGhp cy0+dnQtPkNvbm5lY3REaXJlY3QgICAgICAgID0gKHZvaWQgKilGaWx0ZXJHcmFwaF9Db25u ZWN0RGlyZWN0OworICAgIFRoaXMtPnZ0LT5SZWNvbm5lY3QgICAgICAgICAgICA9ICh2b2lk ICopRmlsdGVyR3JhcGhfUmVjb25uZWN0OworICAgIFRoaXMtPnZ0LT5EaXNjb25uZWN0ICAg ICAgICAgICA9ICh2b2lkICopRmlsdGVyR3JhcGhfRGlzY29ubmVjdDsKKyAgICBUaGlzLT52 dC0+U2V0RGVmYXVsdFN5bmNTb3VyY2UgPSAodm9pZCAqKUZpbHRlckdyYXBoX1NldERlZmF1 bHRTeW5jU291cmNlOwogCiAgICAgVGhpcy0+aW50ZXJmYWNlc1swXSA9IElJRF9JVW5rbm93 bjsKICAgICBUaGlzLT5pbnRlcmZhY2VzWzFdID0gSUlEX0lGaWx0ZXJHcmFwaDsKZGlmZiAt LWdpdCBhL2xvYWRlci9leHQuYyBiL2xvYWRlci9leHQuYwppbmRleCA1NDgzYTBiN2UuLmNm ZGNlMTI1OCAxMDA2NDQKLS0tIGEvbG9hZGVyL2V4dC5jCisrKyBiL2xvYWRlci9leHQuYwpA QCAtNDQ0LDcgKzQ0NCw3IEBAIExQVk9JRCBXSU5BUEkgVmlydHVhbEFsbG9jKExQVk9JRCBh ZGRyZXNzLCBEV09SRCBzaXplLCBEV09SRCB0eXBlLCAgRFdPUkQgcHJvdGVjCiAKICAgICBp ZiAodHlwZSZNRU1fUkVTRVJWRSAmJiAodW5zaWduZWQpYWRkcmVzcyYweGZmZmYpIHsKIAlz aXplICs9ICh1bnNpZ25lZClhZGRyZXNzJjB4ZmZmZjsKLQlhZGRyZXNzID0gKHVuc2lnbmVk KWFkZHJlc3MmfjB4ZmZmZjsKKwlhZGRyZXNzID0gKExQVk9JRCkoKHVuc2lnbmVkKWFkZHJl c3MmfjB4ZmZmZik7CiAgICAgfQogICAgIHBnc3ogPSBzeXNjb25mKF9TQ19QQUdFU0laRSk7 CiAgICAgaWYgKHR5cGUmTUVNX0NPTU1JVCAmJiAodW5zaWduZWQpYWRkcmVzcyVwZ3N6KSB7 CmRpZmYgLS1naXQgYS9sb2FkZXIvbW9kdWxlLmMgYi9sb2FkZXIvbW9kdWxlLmMKaW5kZXgg MWE0NWVmY2U2Li5kZjY3OWJlYWEgMTAwNjQ0Ci0tLSBhL2xvYWRlci9tb2R1bGUuYworKysg Yi9sb2FkZXIvbW9kdWxlLmMKQEAgLTg0NCw3ICs4NDQsNyBAQCBzdGF0aWMgaW50IHJlcG9y dF9mdW5jKHZvaWQgKnN0YWNrX2Jhc2UsIGludCBzdGFja19zaXplLCByZWczODZfdCAqcmVn LCB1aW50MzJfdAogICAvLyBtZW1vcnkgbWFuYWdlbWVudDoKICAgY2FzZSAweDE1MDAxMTog Ly9OZXdQdHJDbGVhcgogICBjYXNlIDB4MTUwMDEyOiAvL05ld1B0clN5c0NsZWFyCi0gICAg ICByZWctPmVheCA9IG1hbGxvYygoKHVpbnQzMl90ICopc3RhY2tfYmFzZSlbMV0pOworICAg ICAgcmVnLT5lYXggPSAodWludHB0cl90KW1hbGxvYygoKHVpbnQzMl90ICopc3RhY2tfYmFz ZSlbMV0pOwogICAgICAgbWVtc2V0KCh2b2lkICopcmVnLT5lYXgsMCwoKHVpbnQzMl90ICop c3RhY2tfYmFzZSlbMV0pOwogI2lmZGVmIERFQlVHX1FUWF9BUEkKICAgICAgIHByaW50Zigi JSpzTEVBVkUoJWQpOiBFTVVMQVRFRCEgMHglWFxuIixyZXRfaSoyLCIiLHJldF9pLCByZWct PmVheCk7CkBAIC04NTIsNyArODUyLDcgQEAgc3RhdGljIGludCByZXBvcnRfZnVuYyh2b2lk ICpzdGFja19iYXNlLCBpbnQgc3RhY2tfc2l6ZSwgcmVnMzg2X3QgKnJlZywgdWludDMyX3QK ICAgICAgIHJldHVybiAxOwogICBjYXNlIDB4MTUwMDBGOiAvL05ld1B0cgogICBjYXNlIDB4 MTUwMDEwOiAvL05ld1B0clN5cwotICAgICAgcmVnLT5lYXggPSBtYWxsb2MoKCh1aW50MzJf dCAqKXN0YWNrX2Jhc2UpWzFdKTsKKyAgICAgIHJlZy0+ZWF4ID0gKHVpbnRwdHJfdCltYWxs b2MoKCh1aW50MzJfdCAqKXN0YWNrX2Jhc2UpWzFdKTsKICNpZmRlZiBERUJVR19RVFhfQVBJ CiAgICAgICBwcmludGYoIiUqc0xFQVZFKCVkKTogRU1VTEFURUQhIDB4JVhcbiIscmV0X2kq MiwiIixyZXRfaSwgcmVnLT5lYXgpOwogI2VuZGlmCmRpZmYgLS1naXQgYS9sb2FkZXIvd2lu MzIuYyBiL2xvYWRlci93aW4zMi5jCmluZGV4IDZkNTU5YTdlNy4uMGM1YmNjYTkzIDEwMDY0 NAotLS0gYS9sb2FkZXIvd2luMzIuYworKysgYi9sb2FkZXIvd2luMzIuYwpAQCAtNjAzLDcg KzYwMyw3IEBAIHN0YXRpYyBITU9EVUxFIFdJTkFQSSBleHBHZXRNb2R1bGVIYW5kbGVXKGNv bnN0IHVpbnQxNl90KiBuYW1lKQogICAgIGludCBwb3MgPSAwOwogICAgIHdoaWxlICgqbmFt ZSkgewogICAgICAgICBpZiAoKm5hbWUgPiAyNTYgfHwgcG9zID49IHNpemVvZihhbmFtZSkg LSAxKQotICAgICAgICAgICAgcmV0dXJuIE5VTEw7CisgICAgICAgICAgICByZXR1cm4gKEhN T0RVTEUpTlVMTDsKICAgICAgICAgYW5hbWVbcG9zKytdID0gKm5hbWUrKzsKICAgICB9CiAg ICAgYW5hbWVbcG9zXSA9IDA7CkBAIC0xNTA0LDcgKzE1MDQsNyBAQCBzdGF0aWMgdm9pZCBX SU5BUEkgZXhwRGVsZXRlQ3JpdGljYWxTZWN0aW9uKENSSVRJQ0FMX1NFQ1RJT04gKmMpCiBz dGF0aWMgaW50IFdJTkFQSSBleHBHZXRDdXJyZW50VGhyZWFkSWQodm9pZCkKIHsKICAgICBk YmdwcmludGYoIkdldEN1cnJlbnRUaHJlYWRJZCgpID0+ICVkXG4iLCBwdGhyZWFkX3NlbGYo KSk7Ci0gICAgcmV0dXJuIHB0aHJlYWRfc2VsZigpOworICAgIHJldHVybiAoaW50KXB0aHJl YWRfc2VsZigpOwogfQogc3RhdGljIGludCBXSU5BUEkgZXhwR2V0Q3VycmVudFByb2Nlc3Mo dm9pZCkKIHsKQEAgLTIwMTksMTUgKzIwMTksMTYgQEAgc3RhdGljIERXT1JEIFdJTkFQSSBl eHBTaWduYWxPYmplY3RBbmRXYWl0KEhBTkRMRSBoT2JqZWN0VG9TaWduYWwsCiAgICAgICAg IGV4cFNldEV2ZW50KG1saXN0KTsKICAgICAgICAgYnJlYWs7CiAgICAgY2FzZSAxOiAgLy8g U2VtYXBob3JlCi0gICAgICAgIGV4cFJlbGVhc2VTZW1hcGhvcmUobWxpc3QsIDEsIE5VTEwp OworICAgICAgICBleHBSZWxlYXNlU2VtYXBob3JlKChpbnRwdHJfdCltbGlzdCwgMSwgTlVM TCk7CiAgICAgICAgIGJyZWFrOwogICAgIGNhc2UgMjogIC8vIE11dGV4Ci0gICAgICAgIGV4 cFJlbGVhc2VNdXRleChtbGlzdCk7CisgICAgICAgIGV4cFJlbGVhc2VNdXRleCgoSEFORExF KW1saXN0KTsKICAgICAgICAgYnJlYWs7CiAgICAgZGVmYXVsdDoKICAgICAgICAgZGJncHJp bnRmKCJTaWduYWxsaW5nIHVua25vd24gb2JqZWN0IHR5cGUgJWQhXG4iLCBoT2JqZWN0VG9T aWduYWwpOwogICAgIH0KLSAgICByZXR1cm4gZXhwV2FpdEZvclNpbmdsZU9iamVjdChoT2Jq ZWN0VG9XYWl0T24sIGR3TWlsbGlzZWNvbmRzKTsKKyAgICByZXR1cm4gKERXT1JEKWV4cFdh aXRGb3JTaW5nbGVPYmplY3QoKHZvaWQgKiloT2JqZWN0VG9XYWl0T24sCisgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGR3TWlsbGlzZWNvbmRzKTsKIH0KIAog c3RhdGljIGxvbmcgV0lOQVBJIGV4cFJlZ09wZW5LZXlFeEEobG9uZyBrZXksIGNvbnN0IGNo YXIqIHN1YmtleSwgbG9uZyByZXNlcnZlZCwgbG9uZyBhY2Nlc3MsIGludCogbmV3a2V5KQpA QCAtMjc1MSw3ICsyNzUyLDcgQEAgc3RhdGljIGludCBXSU5BUEkgZXhwRW51bURpc3BsYXlN b25pdG9ycyh2b2lkICpkYywgUkVDVCAqciwKIHsKICAgICBkYmdwcmludGYoIkVudW1EaXNw bGF5TW9uaXRvcnMoMHgleCwgMHgleCwgMHgleCwgMHgleCkgPT4gP1xuIiwKIAlkYywgciwg Y2FsbGJhY2tfcHJvYywgY2FsbGJhY2tfcGFyYW0pOwotICAgIHJldHVybiBjYWxsYmFja19w cm9jKDAsIGRjLCByLCBjYWxsYmFja19wYXJhbSk7CisgICAgcmV0dXJuIGNhbGxiYWNrX3By b2MoMCwgKEhEQylkYywgciwgKExQQVJBTSljYWxsYmFja19wYXJhbSk7CiB9CiAKICNpZiAw CkBAIC0yODUxLDE0ICsyODUyLDE0IEBAIHN0YXRpYyBpbnQgV0lOQVBJIGV4cEVudW1XaW5k b3dzKGludCAoKmNhbGxiYWNrX2Z1bmMpKEhXTkQsIExQQVJBTSksIHZvaWQgKmNhbGxiCiB7 CiAgICAgaW50IGksIGkyOwogICAgIGRiZ3ByaW50ZigiRW51bVdpbmRvd3MoMHgleCwgMHgl eCkgPT4gMVxuIiwgY2FsbGJhY2tfZnVuYywgY2FsbGJhY2tfcGFyYW0pOwotICAgIGkgPSBj YWxsYmFja19mdW5jKDAsIGNhbGxiYWNrX3BhcmFtKTsKLSAgICBpMiA9IGNhbGxiYWNrX2Z1 bmMoMSwgY2FsbGJhY2tfcGFyYW0pOworICAgIGkgPSBjYWxsYmFja19mdW5jKDAsIChMUEFS QU0pY2FsbGJhY2tfcGFyYW0pOworICAgIGkyID0gY2FsbGJhY2tfZnVuYygxLCAoTFBBUkFN KWNhbGxiYWNrX3BhcmFtKTsKICAgICByZXR1cm4gaSAmJiBpMjsKIH0KIAogc3RhdGljIGlu dCBXSU5BUEkgZXhwR2V0V2luZG93VGhyZWFkUHJvY2Vzc0lkKEhXTkQgd2luLCBpbnQgKnBp ZF9kYXRhKQogewotICAgIGludCB0aWQgPSBwdGhyZWFkX3NlbGYoKTsKKyAgICBpbnQgdGlk ID0gKGludClwdGhyZWFkX3NlbGYoKTsKICAgICBkYmdwcmludGYoIkdldFdpbmRvd1RocmVh ZFByb2Nlc3NJZCgweCV4LCAweCV4KSA9PiAlZFxuIiwKIAl3aW4sIHBpZF9kYXRhLCB0aWQp OwogICAgIGlmIChwaWRfZGF0YSkKQEAgLTQ5NDAsNyArNDk0MSw3IEBAIHN0YXRpYyBIUEFM RVRURSBXSU5BUEkgZXhwQ3JlYXRlUGFsZXR0ZShDT05TVCBMT0dQQUxFVFRFICpscGdwbCkK ICAgICBkYmdwcmludGYoIkNyZWF0ZVBhbGV0dGUoJXgpID0+IE5VTExcbiIsIGxwZ3BsKTsK IAogICAgIGkgPSBzaXplb2YoTE9HUEFMRVRURSkrKChscGdwbC0+cGFsTnVtRW50cmllcy0x KSpzaXplb2YoUEFMRVRURUVOVFJZKSk7Ci0gICAgdGVzdCA9IG1hbGxvYyhpKTsKKyAgICB0 ZXN0ID0gKEhQQUxFVFRFKW1hbGxvYyhpKTsKICAgICBtZW1jcHkoKHZvaWQgKil0ZXN0LCBs cGdwbCwgaSk7CiAKICAgICByZXR1cm4gdGVzdDsKZGlmZiAtLWdpdCBhL21wX21zZy5jIGIv bXBfbXNnLmMKaW5kZXggM2IwNTk4MDFhLi42ZTY1M2FiM2IgMTAwNjQ0Ci0tLSBhL21wX21z Zy5jCisrKyBiL21wX21zZy5jCkBAIC03MCw3ICs3MCw3IEBAIGNvbnN0IGNoYXIqIGZpbGVu YW1lX3JlY29kZShjb25zdCBjaGFyKiBmaWxlbmFtZSkKICAgICBmaWxlbmFtZV9sZW4gPSBz dHJsZW4oZmlsZW5hbWUpOwogICAgIG1heF9wYXRoID0gTVNHU0laRV9NQVggLSA0OwogICAg IHByZWNvZGVkID0gcmVjb2RlZF9maWxlbmFtZTsKLSAgICBpZiAoaWNvbnYoaW52X21zZ2lj b252LCAoY2hhciAqKikmZmlsZW5hbWUsICZmaWxlbmFtZV9sZW4sCisgICAgaWYgKGljb252 KGludl9tc2dpY29udiwgKHZvaWQgKikmZmlsZW5hbWUsICZmaWxlbmFtZV9sZW4sCiAgICAg ICAgICAgICAgICZwcmVjb2RlZCwgJm1heF9wYXRoKSA9PSAoc2l6ZV90KSgtMSkgJiYgZXJy bm8gPT0gRTJCSUcpIHsKICAgICAgICAgcHJlY29kZWRbMF0gPSBwcmVjb2RlZFsxXSA9IHBy ZWNvZGVkWzJdID0gJy4nOwogICAgICAgICBwcmVjb2RlZCArPSAzOwpAQCAtMjMzLDcgKzIz Myw3IEBAIHZvaWQgbXBfbXNnX3ZhKGludCBtb2QsIGludCBsZXYsIGNvbnN0IGNoYXIgKmZv cm1hdCwgdmFfbGlzdCB2YSl7CiAgICAgICAgICAgICAgICAsTVNHX0NIQVJTRVQsbXBfbXNn X2NoYXJzZXQpOwogICAgICAgfWVsc2V7CiAgICAgICBtZW1zZXQodG1wMiwgMCwgTVNHU0la RV9NQVgpOwotICAgICAgd2hpbGUgKGljb252KG1zZ2ljb252LCAmaW4sICZpbmxlbiwgJm91 dCwgJm91dGxlbikgPT0gLTEpIHsKKyAgICAgIHdoaWxlIChpY29udihtc2dpY29udiwgKHZv aWQgKikmaW4sICZpbmxlbiwgJm91dCwgJm91dGxlbikgPT0gLTEpIHsKICAgICAgICAgaWYg KCFpbmxlbiB8fCAhb3V0bGVuKQogICAgICAgICAgIGJyZWFrOwogICAgICAgICAqb3V0Kysg PSAqaW4rKzsKZGlmZiAtLWdpdCBhL3N0cmVhbS9hc2ZfbW1zdF9zdHJlYW1pbmcuYyBiL3N0 cmVhbS9hc2ZfbW1zdF9zdHJlYW1pbmcuYwppbmRleCA2YjdiNmVmYzAuLmVmYzVjOGJmOSAx MDA2NDQKLS0tIGEvc3RyZWFtL2FzZl9tbXN0X3N0cmVhbWluZy5jCisrKyBiL3N0cmVhbS9h c2ZfbW1zdF9zdHJlYW1pbmcuYwpAQCAtMTUwLDcgKzE1MCw3IEBAIHN0YXRpYyB2b2lkIHN0 cmluZ191dGYxNihjaGFyICpkZXN0LCBjaGFyICpzcmMsIGludCBsZW4pIHsKICAgICBsZW4x ID0gbGVuOyBsZW4yID0gMTAwMDsKICAgICBpcCA9IHNyYzsgb3AgPSBkZXN0OwogCi0gICAg aWNvbnYodXJsX2NvbnYsICZpcCwgJmxlbjEsICZvcCwgJmxlbjIpOworICAgIGljb252KHVy bF9jb252LCAodm9pZCAqKSZpcCwgJmxlbjEsICZvcCwgJmxlbjIpOwogICAgIH0KICAgICBl bHNlCiAgICAgewpkaWZmIC0tZ2l0IGEvc3ViL2ZvbnRfbG9hZF9mdC5jIGIvc3ViL2ZvbnRf bG9hZF9mdC5jCmluZGV4IGJkM2UxYzFkZS4uZTBmOWI4NWQ5IDEwMDY0NAotLS0gYS9zdWIv Zm9udF9sb2FkX2Z0LmMKKysrIGIvc3ViL2ZvbnRfbG9hZF9mdC5jCkBAIC03NDMsNyArNzQz LDcgQEAgc3RhdGljIEZUX1VMb25nIGRlY29kZV9jaGFyKGljb252X3QgKmNkLCBjaGFyIGMp IHsKICAgICBzaXplX3QgaW5ieXRlc2xlZnQgPSAxOwogICAgIHNpemVfdCBvdXRieXRlc2xl ZnQgPSBzaXplb2YoRlRfVUxvbmcpOwogCi0gICAgaWNvbnYoKmNkLCAmaW5idWYsICZpbmJ5 dGVzbGVmdCwgJm91dGJ1ZiwgJm91dGJ5dGVzbGVmdCk7CisgICAgaWNvbnYoKmNkLCAodm9p ZCAqKSZpbmJ1ZiwgJmluYnl0ZXNsZWZ0LCAmb3V0YnVmLCAmb3V0Ynl0ZXNsZWZ0KTsKIAog ICAgIC8qIGNvbnZlcnQgdW5pY29kZSBCaWdFbmRpYW4gLT4gTWFjaGluZUVuZGlhbiAqLwog ICAgIG8gPSBiZTJtZV8zMihvKTsKZGlmZiAtLWdpdCBhL3N1Yi9zdWJyZWFkZXIuYyBiL3N1 Yi9zdWJyZWFkZXIuYwppbmRleCAzYzgxNWQxMzIuLjcyZDYzYWU5YyAxMDA2NDQKLS0tIGEv c3ViL3N1YnJlYWRlci5jCisrKyBiL3N1Yi9zdWJyZWFkZXIuYwpAQCAtMTI3MSw3ICsxMjcx LDcgQEAgdm9pZCBzdWJjcF9yZWNvZGUgKHN1YnRpdGxlICpzdWIpCiAJCSAgIAljb250aW51 ZTsKIAkJfQogCQlvcCA9IG90OwotCQlpZiAoaWNvbnYoaWNkc2MsICZpcCwgJmlsZWZ0LAor CQlpZiAoaWNvbnYoaWNkc2MsICh2b2lkICopJmlwLCAmaWxlZnQsCiAJCQkgICZvcCwgJm9s ZWZ0KSA9PSAoc2l6ZV90KSgtMSkpIHsKIAkJCW1wX21zZyhNU0dUX1NVQlJFQURFUixNU0dM X1dBUk4sIlNVQjogZXJyb3IgcmVjb2RpbmcgbGluZS5cbiIpOwogCQkJZnJlZShvdCk7Ci0t IAoyLjQyLjAKCg== --------------070505040805090405080405 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ MPlayer-dev-eng mailing list [email protected] https://lists.mplayerhq.hu/mailman/listinfo/mplayer-dev-eng --------------070505040805090405080405--