ffmpeg 7 support
Xavier Bachelot via xine-devel <[email protected]> Mon, 22 Apr 2024 13:32:06 +0200
| Newsgroups | gmane.comp.video.xine.devel |
|---|---|
| Message-ID | <[email protected]> |
--=_499bb8a337e0dd5263ddb3e14d2cef47 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=US-ASCII; format=flowed Hi, I got sent this patch in preparation to ffmpeg 7 inclusion in Fedora (Please ignore the part about the specfile, this is obviously irrelevant here). I believe this is not usable as is, but should give hints as to what needs tweaking. Please kindly take a look. I'm not even sure xine-lib 1.2.13 has ffmpeg 6 support out of the box. Maybe a release would be in order ? Regards, Xavier --=_499bb8a337e0dd5263ddb3e14d2cef47 Content-Transfer-Encoding: base64 Content-Type: text/x-diff; name=xine-lib-ffmpeg7.patch Content-Disposition: attachment; filename=xine-lib-ffmpeg7.patch; size=13547 RnJvbSBjMTRkOWM2Y2Y5Yzk2MjhhZjE2YjM0OWM3ZjkxM2Q1NDVkN2Y1ZjNlIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBSb2JlcnQtQW5kcsOpIE1hdWNoaW4gPHplYm9iLm1AZ21haWwu Y29tPgpEYXRlOiBBcHIgMTQgMjAyNCAwNzowNzozMSArMDAwMApTdWJqZWN0OiBBZGQgcGF0Y2gg Zm9yIEZGTVBFRyA3IGNvbXBhdGliaWxpdHkKCgotLS0KCmRpZmYgLS1naXQgYS8uZ2l0aWdub3Jl IGIvLmdpdGlnbm9yZQppbmRleCA0NmQ3Y2UyLi5iMjNiMjI2IDEwMDY0NAotLS0gYS8uZ2l0aWdu b3JlCisrKyBiLy5naXRpZ25vcmUKQEAgLTEsNyArMSw1IEBACi14aW5lLWxpYi0xLjEuMTktYXV0 b3Rvb2xzLnBhdGNoLmJ6MgoteGluZS1saWItMS4xLjE5LXBydW5lZC50YXIuYnoyCi0veGluZS1s aWItMS4xLjIwLXBydW5lZC50YXIueHoKLS94aW5lLWxpYi0xLjEuMjAuMS1wcnVuZWQudGFyLnh6 Ci0veGluZS1saWItMS4xLjIxLXBydW5lZC50YXIueHoKLS94aW5lLWxpYi0xLjIuMTIudGFyLnh6 Ci0veGluZS1saWItMS4yLjEzLnRhci54egorL3hpbmUtbGliLTEuMS4xOS1hdXRvdG9vbHMucGF0 Y2guYnoyCisveGluZS1saWItMS4xLjE5LXBydW5lZC50YXIuYnoyCisveGluZS1saWItKi50YXIu eHoKKy9yZXN1bHRzXyoKKy8qLnJwbQpkaWZmIC0tZ2l0IGEvMDAwMS1SZW1vdmUtZGVwcmVjYXRl ZC1mZm1wZWctcmVmZXJlbmNlLnBhdGNoIGIvMDAwMS1SZW1vdmUtZGVwcmVjYXRlZC1mZm1wZWct cmVmZXJlbmNlLnBhdGNoCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjY0OWQ1 OGYKLS0tIC9kZXYvbnVsbAorKysgYi8wMDAxLVJlbW92ZS1kZXByZWNhdGVkLWZmbXBlZy1yZWZl cmVuY2UucGF0Y2gKQEAgLTAsMCArMSwyOTQgQEAKK0Zyb20gNjMwMmJjMDBkNGQ0NDIwZjlhMjI2 ZWE3NzAzMDU3Y2FlYzUyMDc1NiBNb24gU2VwIDE3IDAwOjAwOjAwIDIwMDEKK0Zyb206ID0/VVRG LTg/cT9Sb2JlcnQtQW5kcj1DMz1BOT0yME1hdWNoaW4/PSA8emVib2IubUBnbWFpbC5jb20+CitE YXRlOiBTYXQsIDEzIEFwciAyMDI0IDIyOjA5OjQ0ICswMjAwCitTdWJqZWN0OiBbUEFUQ0hdIFJl bW92ZSBkZXByZWNhdGVkIGZmbXBlZyByZWZlcmVuY2UKKworLS0tCisgc3JjL2NvbWJpbmVkL2Zm bXBlZy9mZl9hdWRpb19kZWNvZGVyLmMgfCAgNiArLQorIHNyYy9jb21iaW5lZC9mZm1wZWcvZmZf dmlkZW9fZGVjb2Rlci5jIHwgODYgKy0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KKyBzcmMvY29t YmluZWQvZmZtcGVnL2ZmbXBlZ19jb21wYXQuaCAgICB8ICA2IC0tCisgc3JjL2R4cjMvZmZtcGVn X2VuY29kZXIuYyAgICAgICAgICAgICAgfCAgNCArLQorIDQgZmlsZXMgY2hhbmdlZCwgNyBpbnNl cnRpb25zKCspLCA5NSBkZWxldGlvbnMoLSkKKworZGlmZiAtLWdpdCBhL3NyYy9jb21iaW5lZC9m Zm1wZWcvZmZfYXVkaW9fZGVjb2Rlci5jIGIvc3JjL2NvbWJpbmVkL2ZmbXBlZy9mZl9hdWRpb19k ZWNvZGVyLmMKK2luZGV4IGI1NDJiODUuLjFjZDRiOTMgMTAwNjQ0CistLS0gYS9zcmMvY29tYmlu ZWQvZmZtcGVnL2ZmX2F1ZGlvX2RlY29kZXIuYworKysrIGIvc3JjL2NvbWJpbmVkL2ZmbXBlZy9m Zl9hdWRpb19kZWNvZGVyLmMKK0BAIC0xOTIsNyArMTkyLDcgQEAgc3RhdGljIGludCBmZl9hYWNf bW9kZV9wYXJzZSAoZmZfYXVkaW9fZGVjb2Rlcl90ICp0aGlzLCB1aW50OF90ICpidWYsIGludCBz aXplLAorICAgICAgICAgICAgICJmZm1wZWdfYXVkaW9fZGVjOiBzdHJlYW0gc2F5cyBMQVRNIGJ1 dCBpcyBBRFRTIC0+IHN3aXRjaGluZyBkZWNvZGVyc1xuIik7CisgICAgICAgICAgIGlmICh0aGlz LT5kZWNvZGVyX29rKSB7CisgICAgICAgICAgICAgcHRocmVhZF9tdXRleF9sb2NrICgmZmZtcGVn X2xvY2spOworLSAgICAgICAgICAgIGF2Y29kZWNfY2xvc2UgKHRoaXMtPmNvbnRleHQpOworKyAg ICAgICAgICAgIGF2Y29kZWNfZnJlZV9jb250ZXh0ICgmdGhpcy0+Y29udGV4dCk7CisgICAgICAg ICAgICAgcHRocmVhZF9tdXRleF91bmxvY2sgKCZmZm1wZWdfbG9jayk7CisgICAgICAgICAgICAg dGhpcy0+ZGVjb2Rlcl9vayA9IDA7CisgICAgICAgICAgIH0KK0BAIC0xMzExLDcgKzEzMTEsNyBA QCBzdGF0aWMgdm9pZCBmZl9hdWRpb19yZXNldCAoYXVkaW9fZGVjb2Rlcl90ICp0aGlzX2dlbikg eworICAgICB9CisgI2VuZGlmCisgICAgIHB0aHJlYWRfbXV0ZXhfbG9jayAoJmZmbXBlZ19sb2Nr KTsKKy0gICAgYXZjb2RlY19jbG9zZSAodGhpcy0+Y29udGV4dCk7CisrICAgIGF2Y29kZWNfZnJl ZV9jb250ZXh0ICgmdGhpcy0+Y29udGV4dCk7CisgICAgIGlmIChYRkZfQVZDT0RFQ19PUEVOICh0 aGlzLT5jb250ZXh0LCB0aGlzLT5jb2RlYykgPCAwKQorICAgICAgIHRoaXMtPmRlY29kZXJfb2sg PSAwOworICAgICBwdGhyZWFkX211dGV4X3VubG9jayAoJmZmbXBlZ19sb2NrKTsKK0BAIC0xMzUz LDcgKzEzNTMsNyBAQCBzdGF0aWMgdm9pZCBmZl9hdWRpb19kaXNwb3NlIChhdWRpb19kZWNvZGVy X3QgKnRoaXNfZ2VuKSB7CisgICAgIH0KKyAjZW5kaWYKKyAgICAgcHRocmVhZF9tdXRleF9sb2Nr ICgmZmZtcGVnX2xvY2spOworLSAgICBhdmNvZGVjX2Nsb3NlICh0aGlzLT5jb250ZXh0KTsKKysg ICAgYXZjb2RlY19mcmVlX2NvbnRleHQgKCZ0aGlzLT5jb250ZXh0KTsKKyAgICAgcHRocmVhZF9t dXRleF91bmxvY2sgKCZmZm1wZWdfbG9jayk7CisgICB9CisgCitkaWZmIC0tZ2l0IGEvc3JjL2Nv bWJpbmVkL2ZmbXBlZy9mZl92aWRlb19kZWNvZGVyLmMgYi9zcmMvY29tYmluZWQvZmZtcGVnL2Zm X3ZpZGVvX2RlY29kZXIuYworaW5kZXggNTRlZmMwNS4uMGM3N2IwOSAxMDA2NDQKKy0tLSBhL3Ny Yy9jb21iaW5lZC9mZm1wZWcvZmZfdmlkZW9fZGVjb2Rlci5jCisrKysgYi9zcmMvY29tYmluZWQv ZmZtcGVnL2ZmX3ZpZGVvX2RlY29kZXIuYworQEAgLTkyLDggKzkyLDYgQEAKKyAjZGVmaW5lIFZJ REVPQlVGU0laRSAgICAgICAgKDEyOCoxMDI0KQorICNkZWZpbmUgU0xJQ0VfQlVGRkVSX1NJWkUg ICAoMTE5NCoxMDI0KQorIAorLSNkZWZpbmUgU0xJQ0VfT0ZGU0VUX1NJWkUgICAxMjgKKy0KKyAj ZGVmaW5lIEVOQUJMRV9ESVJFQ1RfUkVOREVSSU5HIAorIAorICNpZm5kZWYgRU5BQkxFX0RJUkVD VF9SRU5ERVJJTkcKK0BAIC0xNDgsMTAgKzE0Niw2IEBAIHN0cnVjdCBmZl92aWRlb19kZWNvZGVy X3MgeworICAgaW50ICAgICAgICAgICAgICAgc2l6ZTsKKyAgIGludCAgICAgICAgICAgICAgIHNr aXBmcmFtZXM7CisgCistICBpbnQgICAgICAgICAgICAgICpzbGljZV9vZmZzZXRfdGFibGU7Cist ICBpbnQgICAgICAgICAgICAgICBzbGljZV9vZmZzZXRfc2l6ZTsKKy0gIGludCAgICAgICAgICAg ICAgIHNsaWNlX29mZnNldF9wb3M7CistCisgICBBVkZyYW1lICAgICAgICAgICphdl9mcmFtZTsK KyAgIEFWRnJhbWUgICAgICAgICAgKmF2X2ZyYW1lMjsKKyAgIEFWQ29kZWNDb250ZXh0ICAgKmNv bnRleHQ7CitAQCAtNTUxLDcgKzU0NSw2IEBAIHN0YXRpYyBpbnQgZ2V0X2J1ZmZlcl92YWFwaV92 bGQgKEFWQ29kZWNDb250ZXh0ICpjb250ZXh0LCBBVkZyYW1lICphdl9mcmFtZSkKKyAjICBpZmRl ZiBYRkZfRlJBTUVfQUdFCisgICBhdl9mcmFtZS0+YWdlID0gMTsKKyAjICBlbmRpZgorLSAgYXZf ZnJhbWUtPnJlb3JkZXJlZF9vcGFxdWUgPSBjb250ZXh0LT5yZW9yZGVyZWRfb3BhcXVlOworIAor ICAgZmZzZiA9IGZmc2ZfbmV3ICh0aGlzKTsKKyAgIGlmICghZmZzZikKK0BAIC04NjEsOSArODU0 LDYgQEAgc3RhdGljIGludCBnZXRfYnVmZmVyIChBVkNvZGVjQ29udGV4dCAqY29udGV4dCwgQVZG cmFtZSAqYXZfZnJhbWUpCisgICBhdl9mcmFtZS0+YWdlID0gMjU2KjI1NioyNTYqNjQ7CisgIyBl bmRpZgorIAorLSAgLyogdGFrZSBvdmVyIHB0cyBmb3IgdGhpcyBmcmFtZSB0byBoYXZlIGl0IHJl b3JkZXJlZCAqLworLSAgYXZfZnJhbWUtPnJlb3JkZXJlZF9vcGFxdWUgPSBjb250ZXh0LT5yZW9y ZGVyZWRfb3BhcXVlOworLQorICAgcmV0dXJuIDA7CisgfQorIAorQEAgLTExNDIsNyArMTEzMiw3 IEBAIHN0YXRpYyB2b2lkIGluaXRfdmlkZW9fY29kZWMgKGZmX3ZpZGVvX2RlY29kZXJfdCAqdGhp cywgdW5zaWduZWQgaW50IGNvZGVjX3R5cGUpCisgICBpZiAodGhpcy0+Y29kZWMtPmlkID09IENP REVDX0lEX1ZDMSAmJgorICAgICAgICghdGhpcy0+YmloLmJpV2lkdGggfHwgIXRoaXMtPmJpaC5i aUhlaWdodCkpIHsKKyAgICAgLyogVkMxIGNvZGVjIG11c3QgYmUgcmUtb3BlbmVkIHdpdGggY29y cmVjdCB3aWR0aCBhbmQgaGVpZ2h0LiAqLworLSAgICBhdmNvZGVjX2Nsb3NlKHRoaXMtPmNvbnRl eHQpOworKyAgICBhdmNvZGVjX2ZyZWVfY29udGV4dCgmdGhpcy0+Y29udGV4dCk7CisgCisgICAg IGlmIChYRkZfQVZDT0RFQ19PUEVOICh0aGlzLT5jb250ZXh0LCB0aGlzLT5jb2RlYykgPCAwKSB7 CisgICAgICAgcHRocmVhZF9tdXRleF91bmxvY2soJmZmbXBlZ19sb2NrKTsKK0BAIC0xMjA2LDEx ICsxMTk2LDYgQEAgc3RhdGljIHZvaWQgaW5pdF92aWRlb19jb2RlYyAoZmZfdmlkZW9fZGVjb2Rl cl90ICp0aGlzLCB1bnNpZ25lZCBpbnQgY29kZWNfdHlwZSkKKyAgICAgICBicmVhazsKKyAgIH0K KyAgIH0KKy0KKy0jaWZkZWYgWEZGX0FWQ09ERUNfUkVPUkRFUkVEX09QQVFVRQorLSAgLyogZG9u dCB3YW50IGluaXRpYWwgQVZfTk9QVFNfVkFMVUUgaGVyZSAqLworLSAgdGhpcy0+Y29udGV4dC0+ cmVvcmRlcmVkX29wYXF1ZSA9IDA7CistI2VuZGlmCisgfQorIAorICNpZmRlZiBFTkFCTEVfVkFB UEkKK0BAIC0xODk1LDM2ICsxODgwLDYgQEAgc3RhdGljIHZvaWQgZmZfaGFuZGxlX3NwZWNpYWxf YnVmZmVyIChmZl92aWRlb19kZWNvZGVyX3QgKnRoaXMsIGJ1Zl9lbGVtZW50X3QgKmIKKyAgICAg dGhpcy0+cGFsZXR0ZV9jaGFuZ2VkID0gMTsKKyAjZW5kaWYKKyAgIH0KKy0gIGVsc2UgaWYgKGJ1 Zi0+ZGVjb2Rlcl9pbmZvWzFdID09IEJVRl9TUEVDSUFMX1JWX0NIVU5LX1RBQkxFKSB7CistICAg IC8qIG8gZGVhci4gTXVsdGlwbGUgZGVjb2RpbmcgdGhyZWFkcyB1c2UgaW5kaXZpZHVhbCBjb250 ZXh0cy4KKy0gICAgICBhdl9kZWNvZGVfdmlkZW8yICgpIGRvZXMgb25seSBjb3B5IHRoZSBfcG9p bnRlcl8gdG8gdGhlIG9mZnNldHMsCistICAgICAgbm90IHRoZSBvZmZzZXRzIHRoZW1zZWx2ZXMu IFNvIHdlIG11c3Qgbm90IG92ZXJ3cml0ZSBhbnl0aGluZworLSAgICAgIHRoYXQgYW5vdGhlciB0 aHJlYWQgaGFzIG5vdCB5ZXQgcmVhZC4gKi8KKy0gICAgaW50IGksIGwsIHRvdGFsOworLQorLSAg ICBscHJpbnRmKCJCVUZfU1BFQ0lBTF9SVl9DSFVOS19UQUJMRVxuIik7CistICAgIGwgPSBidWYt PmRlY29kZXJfaW5mb1syXSArIDE7CistCistICAgIHRvdGFsID0gbCAqIHRoaXMtPmNsYXNzLT50 aHJlYWRfY291bnQ7CistICAgIGlmICh0b3RhbCA8IFNMSUNFX09GRlNFVF9TSVpFKQorLSAgICAg IHRvdGFsID0gU0xJQ0VfT0ZGU0VUX1NJWkU7CistICAgIGlmICh0b3RhbCA+IHRoaXMtPnNsaWNl X29mZnNldF9zaXplKSB7CistICAgICAgdGhpcy0+c2xpY2Vfb2Zmc2V0X3RhYmxlID0gcmVhbGxv YyAodGhpcy0+c2xpY2Vfb2Zmc2V0X3RhYmxlLCB0b3RhbCAqIHNpemVvZiAoaW50KSk7CistICAg ICAgdGhpcy0+c2xpY2Vfb2Zmc2V0X3NpemUgPSB0b3RhbDsKKy0gICAgfQorLQorLSAgICBpZiAo dGhpcy0+c2xpY2Vfb2Zmc2V0X3BvcyArIGwgPiB0aGlzLT5zbGljZV9vZmZzZXRfc2l6ZSkKKy0g ICAgICB0aGlzLT5zbGljZV9vZmZzZXRfcG9zID0gMDsKKy0gICAgdGhpcy0+Y29udGV4dC0+c2xp Y2Vfb2Zmc2V0ID0gdGhpcy0+c2xpY2Vfb2Zmc2V0X3RhYmxlICsgdGhpcy0+c2xpY2Vfb2Zmc2V0 X3BvczsKKy0gICAgdGhpcy0+Y29udGV4dC0+c2xpY2VfY291bnQgPSBsOworLQorLSAgICBscHJp bnRmICgic2xpY2VfY291bnQ9JWRcbiIsIGwpOworLSAgICBmb3IgKGkgPSAwOyBpIDwgbDsgaSsr KSB7CistICAgICAgdGhpcy0+c2xpY2Vfb2Zmc2V0X3RhYmxlW3RoaXMtPnNsaWNlX29mZnNldF9w b3MrK10gPQorLSAgICAgICAgKCh1aW50MzJfdCAqKWJ1Zi0+ZGVjb2Rlcl9pbmZvX3B0clsyXSlb KDIgKiBpKSArIDFdOworLSAgICAgIGxwcmludGYoInNsaWNlX29mZnNldFslZF09JWRcbiIsIGks IHRoaXMtPmNvbnRleHQtPnNsaWNlX29mZnNldFtpXSk7CistICAgIH0KKy0gIH0KKyB9CisgCisg c3RhdGljIHZvaWQgZmZfZGlzY29udGludWl0eSAodmlkZW9fZGVjb2Rlcl90ICp0aGlzX2dlbikg eworQEAgLTIwOTEsMTMgKzIwNDYsNiBAQCBzdGF0aWMgdm9pZCBmZl9oYW5kbGVfbXBlZzEyX2J1 ZmZlciAoZmZfdmlkZW9fZGVjb2Rlcl90ICp0aGlzLCBidWZfZWxlbWVudF90ICpidQorICAgICBp bnQgbmVlZF91bnJlZiA9IDA7CisgI2VuZGlmCisgCistICAgIC8qIGFwcGx5IHZhbGlkIHB0cyB0 byBmaXJzdCBmcmFtZSBfc3RhcnRpbmdfIHRoZXJlYWZ0ZXIgb25seSAqLworLSAgICBpZiAodGhp cy0+cHRzICYmICF0aGlzLT5jb250ZXh0LT5yZW9yZGVyZWRfb3BhcXVlKSB7CistICAgICAgdGhp cy0+Y29udGV4dC0+cmVvcmRlcmVkX29wYXF1ZSA9IAorLSAgICAgIHRoaXMtPmF2X2ZyYW1lLT5y ZW9yZGVyZWRfb3BhcXVlID0gZmZfdGFnX3B0cyAodGhpcywgdGhpcy0+cHRzKTsKKy0gICAgICB0 aGlzLT5wdHMgPSAwOworLSAgICB9CistCisgICAgIGlmICghZmx1c2gpIHsKKyAgICAgICBjdXJy ZW50ID0gbXBlZ19wYXJzZXJfZGVjb2RlX2RhdGEodGhpcy0+bXBlZ19wYXJzZXIsCisgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGJ1Zi0+Y29udGVudCArIG9mZnNldCwg YnVmLT5jb250ZW50ICsgb2Zmc2V0ICsgc2l6ZSwKK0BAIC0yMjA0LDExICsyMTUyLDYgQEAgc3Rh dGljIHZvaWQgZmZfaGFuZGxlX21wZWcxMl9idWZmZXIgKGZmX3ZpZGVvX2RlY29kZXJfdCAqdGhp cywgYnVmX2VsZW1lbnRfdCAqYnUKKyAgICAgICBpbWctPnByb2dyZXNzaXZlX2ZyYW1lID0gIXRo aXMtPmF2X2ZyYW1lLT5pbnRlcmxhY2VkX2ZyYW1lOworICAgICAgIGltZy0+dG9wX2ZpZWxkX2Zp cnN0ICAgPSB0aGlzLT5hdl9mcmFtZS0+dG9wX2ZpZWxkX2ZpcnN0OworIAorLSAgICAgIC8qIGdl dCBiYWNrIHJlb3JkZXJlZCBwdHMgKi8KKy0gICAgICBpbWctPnB0cyA9IGZmX3VudGFnX3B0cyAo dGhpcywgdGhpcy0+YXZfZnJhbWUtPnJlb3JkZXJlZF9vcGFxdWUpOworLSAgICAgIHRoaXMtPmF2 X2ZyYW1lLT5yZW9yZGVyZWRfb3BhcXVlID0gMDsKKy0gICAgICB0aGlzLT5jb250ZXh0LT5yZW9y ZGVyZWRfb3BhcXVlID0gMDsKKy0KKyAgICAgICBpZiAodGhpcy0+YXZfZnJhbWUtPnJlcGVhdF9w aWN0KQorICAgICAgICAgaW1nLT5kdXJhdGlvbiA9IHRoaXMtPnZpZGVvX3N0ZXAgKiAzIC8gMjsK KyAgICAgICBlbHNlCitAQCAtMjMyNywxMyArMjI3MCw2IEBAIHN0YXRpYyB2b2lkIGZmX2hhbmRs ZV9idWZmZXIgKGZmX3ZpZGVvX2RlY29kZXJfdCAqdGhpcywgYnVmX2VsZW1lbnRfdCAqYnVmKSB7 CisgICAgIHRoaXMtPnNpemUgPSAwOworICAgfQorIAorLSAgaWYgKHRoaXMtPnNpemUgPT0gMCkg eworLSAgICAvKiB0YWtlIG92ZXIgcHRzIHdoZW4gd2UgYXJlIGFib3V0IHRvIGJ1ZmZlciBhIGZy YW1lICovCistICAgIHRoaXMtPmF2X2ZyYW1lLT5yZW9yZGVyZWRfb3BhcXVlID0gZmZfdGFnX3B0 cyh0aGlzLCB0aGlzLT5wdHMpOworLSAgICB0aGlzLT5jb250ZXh0LT5yZW9yZGVyZWRfb3BhcXVl ID0gZmZfdGFnX3B0cyh0aGlzLCB0aGlzLT5wdHMpOworLSAgICB0aGlzLT5wdHMgPSAwOworLSAg fQorLQorICAgLyogZGF0YSBhY2N1bXVsYXRpb24gKi8KKyAgIGlmIChidWYtPnNpemUgPiAwKSB7 CisgICAgIGlmICgodGhpcy0+c2l6ZSA9PSAwKSAmJgorQEAgLTI0MDIsOCArMjMzOCw2IEBAIHN0 YXRpYyB2b2lkIGZmX2hhbmRsZV9idWZmZXIgKGZmX3ZpZGVvX2RlY29kZXJfdCAqdGhpcywgYnVm X2VsZW1lbnRfdCAqYnVmKSB7CisgI2lmZGVmIFhGRl9BVl9CVUZGRVIKKyAgICAgICAgIG5lZWRf dW5yZWYgPSAxOworICNlbmRpZgorLSAgICAgICAgLyogcmVzZXQgY29uc3VtZWQgcHRzIHZhbHVl ICovCistICAgICAgICB0aGlzLT5jb250ZXh0LT5yZW9yZGVyZWRfb3BhcXVlID0gZmZfdGFnX3B0 cyh0aGlzLCAwKTsKKyAKKyAgICAgICAgIGlmIChlcnIpIHsKKyAKK0BAIC0yNDM3LDExICsyMzcx LDYgQEAgc3RhdGljIHZvaWQgZmZfaGFuZGxlX2J1ZmZlciAoZmZfdmlkZW9fZGVjb2Rlcl90ICp0 aGlzLCBidWZfZWxlbWVudF90ICpidWYpIHsKKyAgICAgICAgICAgICBmZl9jaGVja19idWZzaXpl KHRoaXMsIHRoaXMtPnNpemUpOworICAgICAgICAgICAgIG1lbW1vdmUgKHRoaXMtPmJ1ZiwgJmNo dW5rX2J1ZltvZmZzZXRdLCB0aGlzLT5zaXplKTsKKyAgICAgICAgICAgICBjaHVua19idWYgPSB0 aGlzLT5idWY7CistCistICAgICAgICAgICAgLyogdGFrZSBvdmVyIHB0cyBmb3IgbmV4dCBhY2Nl c3MgdW5pdCAqLworLSAgICAgICAgICAgIHRoaXMtPmF2X2ZyYW1lLT5yZW9yZGVyZWRfb3BhcXVl ID0gZmZfdGFnX3B0cyh0aGlzLCB0aGlzLT5wdHMpOworLSAgICAgICAgICAgIHRoaXMtPmNvbnRl eHQtPnJlb3JkZXJlZF9vcGFxdWUgPSBmZl90YWdfcHRzKHRoaXMsIHRoaXMtPnB0cyk7CistICAg ICAgICAgICAgdGhpcy0+cHRzID0gMDsKKyAgICAgICAgICAgfQorICAgICAgICAgfQorICAgICAg IH0KK0BAIC0yNTU3LDkgKzI0ODYsNiBAQCBzdGF0aWMgdm9pZCBmZl9oYW5kbGVfYnVmZmVyIChm Zl92aWRlb19kZWNvZGVyX3QgKnRoaXMsIGJ1Zl9lbGVtZW50X3QgKmJ1ZikgeworICAgICAgICAg ICBmZl9jb252ZXJ0X2ZyYW1lKHRoaXMsIGltZywgdGhpcy0+YXZfZnJhbWUpOworICAgICAgICAg fQorIAorLSAgICAgICAgaW1nLT5wdHMgID0gZmZfdW50YWdfcHRzKHRoaXMsIHRoaXMtPmF2X2Zy YW1lLT5yZW9yZGVyZWRfb3BhcXVlKTsKKy0gICAgICAgIHRoaXMtPmF2X2ZyYW1lLT5yZW9yZGVy ZWRfb3BhcXVlID0gMDsKKy0KKyAgICAgICAgIC8qIHdvcmthcm91bmQgZm9yIHdlaXJkIDEyMGZw cyBzdHJlYW1zICovCisgICAgICAgICBpZiggdmlkZW9fc3RlcF90b191c2UgPT0gNzUwICkgewor ICAgICAgICAgICAvKiBmYWxsYmFjayB0byB0aGUgVklERU9fUFRTX01PREUgKi8KK0BAIC0yNTk3 LDkgKzI1MjMsNiBAQCBzdGF0aWMgdm9pZCBmZl9oYW5kbGVfYnVmZmVyIChmZl92aWRlb19kZWNv ZGVyX3QgKnRoaXMsIGJ1Zl9lbGVtZW50X3QgKmJ1ZikgeworICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIHRoaXMtPmFzcGVjdF9yYXRpbywKKyAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB0aGlzLT5vdXRwdXRfZm9y bWF0LAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFZP X0JPVEhfRklFTERTfHRoaXMtPmZyYW1lX2ZsYWdzKTsKKy0gICAgICAvKiBzZXQgUFRTIHRvIGFs bG93IGVhcmx5IHN5bmNpbmcgKi8KKy0gICAgICBpbWctPnB0cyAgICAgICA9IGZmX3VudGFnX3B0 cyh0aGlzLCB0aGlzLT5hdl9mcmFtZS0+cmVvcmRlcmVkX29wYXF1ZSk7CistICAgICAgdGhpcy0+ YXZfZnJhbWUtPnJlb3JkZXJlZF9vcGFxdWUgPSAwOworIAorICAgICAgIGltZy0+ZHVyYXRpb24g ID0gdmlkZW9fc3RlcF90b191c2U7CisgCitAQCAtMjc4MSw4ICsyNzA0LDYgQEAgc3RhdGljIHZv aWQgZmZfZmx1c2hfaW50ZXJuYWwgKGZmX3ZpZGVvX2RlY29kZXJfdCAqdGhpcywgaW50IGRpc3Bs YXkpIHsKKyAgICAgICBmZl9jb252ZXJ0X2ZyYW1lICh0aGlzLCBpbWcsIHRoaXMtPmF2X2ZyYW1l Mik7CisgICAgIH0KKyAKKy0gICAgaW1nLT5wdHMgPSBmZl91bnRhZ19wdHMgKHRoaXMsIHRoaXMt PmF2X2ZyYW1lMi0+cmVvcmRlcmVkX29wYXF1ZSk7CistCisgICAgIGlmICh2aWRlb19zdGVwX3Rv X3VzZSA9PSA3NTApCisgICAgICAgdmlkZW9fc3RlcF90b191c2UgPSAwOworICAgICBpbWctPmR1 cmF0aW9uID0gdGhpcy0+YXZfZnJhbWUyLT5yZXBlYXRfcGljdCA/IHZpZGVvX3N0ZXBfdG9fdXNl ICogMyAvIDIgOiB2aWRlb19zdGVwX3RvX3VzZTsKK0BAIC0yOTAxLDcgKzI4MjIsNyBAQCBzdGF0 aWMgdm9pZCBmZl9kaXNwb3NlICh2aWRlb19kZWNvZGVyX3QgKnRoaXNfZ2VuKSB7CisgICBpZiAo dGhpcy0+ZGVjb2Rlcl9vaykgeworIAorICAgICBwdGhyZWFkX211dGV4X2xvY2soJmZmbXBlZ19s b2NrKTsKKy0gICAgYXZjb2RlY19jbG9zZSAodGhpcy0+Y29udGV4dCk7CisrICAgIGF2Y29kZWNf ZnJlZV9jb250ZXh0ICgmdGhpcy0+Y29udGV4dCk7CisgICAgIHB0aHJlYWRfbXV0ZXhfdW5sb2Nr KCZmZm1wZWdfbG9jayk7CisgCisgI2lmZGVmIEVOQUJMRV9ESVJFQ1RfUkVOREVSSU5HCitAQCAt MjkxMiw5ICsyODMzLDYgQEAgc3RhdGljIHZvaWQgZmZfZGlzcG9zZSAodmlkZW9fZGVjb2Rlcl90 ICp0aGlzX2dlbikgeworICAgICB0aGlzLT5kZWNvZGVyX29rID0gMDsKKyAgIH0KKyAKKy0gIGlm ICh0aGlzLT5zbGljZV9vZmZzZXRfdGFibGUpCistICAgIGZyZWUgKHRoaXMtPnNsaWNlX29mZnNl dF90YWJsZSk7CistCisgICBpZiAodGhpcy0+Y29udGV4dCkgeworICAgICBfeF9mcmVlcCAoJnRo aXMtPmNvbnRleHQtPmV4dHJhZGF0YSk7CisgICAgIHRoaXMtPmNvbnRleHQtPmV4dHJhZGF0YV9z aXplID0gMDsKK2RpZmYgLS1naXQgYS9zcmMvY29tYmluZWQvZmZtcGVnL2ZmbXBlZ19jb21wYXQu aCBiL3NyYy9jb21iaW5lZC9mZm1wZWcvZmZtcGVnX2NvbXBhdC5oCitpbmRleCA4MDNhY2UyLi40 ZWZlZjE5IDEwMDY0NAorLS0tIGEvc3JjL2NvbWJpbmVkL2ZmbXBlZy9mZm1wZWdfY29tcGF0LmgK KysrKyBiL3NyYy9jb21iaW5lZC9mZm1wZWcvZmZtcGVnX2NvbXBhdC5oCitAQCAtNTMsMTIgKzUz LDYgQEAKKyAjICBkZWZpbmUgcHBfbW9kZQlwcF9tb2RlX3QKKyAjZW5kaWYKKyAKKy0vKiByZW9y ZGVyZWRfb3BhcXVlIGFwcGVhcmVkIGluIGxpYmF2Y29kZWMgNTEuNjguMCAqLworLSNkZWZpbmUg WEZGX0FWQ09ERUNfUkVPUkRFUkVEX09QQVFVRQorLSNpZiBMSUJBVkNPREVDX1ZFUlNJT05fSU5U IDwgWEZGX0lOVF9WRVJTSU9OKDUxLDY4LDApCistIyB1bmRlZiBYRkZfQVZDT0RFQ19SRU9SREVS RURfT1BBUVVFCistI2VuZGlmCistCisgLyogY29sb3JzcGFjZSBhbmQgY29sb3JfcmFuZ2Ugd2Vy ZSBhZGRlZCBiZWZvcmUgNTIuMjkuMCAqLworICNpZiBMSUJBVkNPREVDX1ZFUlNJT05fSU5UID49 IFhGRl9JTlRfVkVSU0lPTig1MiwyOSwwKQorICMgZGVmaW5lIFhGRl9BVkNPREVDX0NPTE9SU1BB Q0UKK2RpZmYgLS1naXQgYS9zcmMvZHhyMy9mZm1wZWdfZW5jb2Rlci5jIGIvc3JjL2R4cjMvZmZt cGVnX2VuY29kZXIuYworaW5kZXggNDJkZWUzYS4uZjI2Y2YzNSAxMDA2NDQKKy0tLSBhL3NyYy9k eHIzL2ZmbXBlZ19lbmNvZGVyLmMKKysrKyBiL3NyYy9keHIzL2ZmbXBlZ19lbmNvZGVyLmMKK0BA IC0xMjcsNyArMTI3LDcgQEAgc3RhdGljIGludCBsYXZjX29uX3VwZGF0ZV9mb3JtYXQoZHhyM19k cml2ZXJfdCAqZHJ2LCBkeHIzX2ZyYW1lX3QgKmZyYW1lKQorICAgdW5zaWduZWQgY2hhciB1c2Vf cXVhbnRpemVyOworIAorICAgaWYgKHRoaXMtPmNvbnRleHQpIHsKKy0gICAgYXZjb2RlY19jbG9z ZSh0aGlzLT5jb250ZXh0KTsKKysgICAgYXZjb2RlY19mcmVlX2NvbnRleHQoJnRoaXMtPmNvbnRl eHQpOworICAgICBmcmVlKHRoaXMtPmNvbnRleHQpOworICAgICBmcmVlKHRoaXMtPnBpY3R1cmUp OworICAgICB0aGlzLT5jb250ZXh0ID0gTlVMTDsKK0BAIC0zNDQsNyArMzQ0LDcgQEAgc3RhdGlj IGludCBsYXZjX29uX3VubmVlZGVkKGR4cjNfZHJpdmVyX3QgKmRydikKKyAjaWYgWEZGX0VOQ1ZJ REVPID4gMQorICAgICBYRkZfUEFDS0VUX1VOUkVGICh0aGlzLT5wa3QpOworICNlbmRpZgorLSAg ICBhdmNvZGVjX2Nsb3NlKHRoaXMtPmNvbnRleHQpOworKyAgICBhdmNvZGVjX2ZyZWVfY29udGV4 dCgmdGhpcy0+Y29udGV4dCk7CisgICAgIFhGRl9GUkVFX0NPTlRFWFQgKHRoaXMtPmNvbnRleHQp OworICAgICBmcmVlKHRoaXMtPnBpY3R1cmUpOworICAgICB0aGlzLT5jb250ZXh0ID0gTlVMTDsK Ky0tIAorMi40NC4wCisKZGlmZiAtLWdpdCBhL3hpbmUtbGliLnNwZWMgYi94aW5lLWxpYi5zcGVj CmluZGV4IGQxZjkwOWEuLmExMzQyMzYgMTAwNjQ0Ci0tLSBhL3hpbmUtbGliLnNwZWMKKysrIGIv eGluZS1saWIuc3BlYwpAQCAtMzIsNyArMzIsNyBAQAogU3VtbWFyeTogICAgICAgIEEgbXVsdGlt ZWRpYSBlbmdpbmUKIE5hbWU6ICAgICAgICAgICB4aW5lLWxpYgogVmVyc2lvbjogICAgICAgIDEu Mi4xMwotUmVsZWFzZTogICAgICAgIDEzJXs/c25hcHNob3Q6LiV7ZGF0ZX1oZyV7cmV2aXNpb259 fSV7P2Rpc3R9CitSZWxlYXNlOiAgICAgICAgMTQlez9zbmFwc2hvdDouJXtkYXRlfWhnJXtyZXZp c2lvbn19JXs/ZGlzdH0KIExpY2Vuc2U6ICAgICAgICBHUEwtMi4wLW9yLWxhdGVyCiBVUkw6ICAg ICAgICAgICAgaHR0cHM6Ly93d3cueGluZS1wcm9qZWN0Lm9yZy8KICVpZiAhIDAlez9zbmFwc2hv dH0KQEAgLTQzLDEwICs0MywxMiBAQCBTb3VyY2UwOiAgICAgICAgeGluZS1saWItJXt2ZXJzaW9u fS0le2RhdGV9aGcle3JldmlzaW9ufS50YXIueHoKICMgU2NyaXB0IHRvIG1ha2UgYSBzbmFwc2hv dAogU291cmNlMTogICAgICAgIG1ha2VfeGluZWxpYl9zbmFwc2hvdC5zaAogCi0jIGZmbXBlZzYg Y29tcGF0aWJpbGl0eQorIyBGRk1QRUcgNiBjb21wYXRpYmlsaXR5CiAjIFNlZTogaHR0cHM6Ly9z b3VyY2Vmb3JnZS5uZXQvcC94aW5lL3hpbmUtbGliLTEuMi9jaS83NzFmNGFlMjdlNTgyMTIzZmYz NTAwNDQ0NzE4ZmM4Zjk2MTg2ZDc0LwogUGF0Y2gwOiAgICAgICAgIHhpbmUtbGliLTEuMi4xMy1m Zm1wZWc2LWNvbXBhdGliaWxpdHkucGF0Y2gKLVBhdGNoMTogeGluZS1saWItY29uZmlndXJlLWM5 OS5wYXRjaAorUGF0Y2gxOiAgICAgICAgIHhpbmUtbGliLWNvbmZpZ3VyZS1jOTkucGF0Y2gKKyMg RkZNUEVHIDcgY29tcGF0aWJpbGl0eQorUGF0Y2gyOiAgICAgICAgIDAwMDEtUmVtb3ZlLWRlcHJl Y2F0ZWQtZmZtcGVnLXJlZmVyZW5jZS5wYXRjaAogCiBQcm92aWRlczogICAgICAgeGluZS1saWIo cGx1Z2luLWFiaSkgPSAle3BsdWdpbl9hYml9CiBQcm92aWRlczogICAgICAgeGluZS1saWIocGx1 Z2luLWFiaSklez9faXNhfSA9ICV7cGx1Z2luX2FiaX0KQEAgLTM0NSw2ICszNDcsOSBAQCBta2Rp ciAtcCAle2J1aWxkcm9vdH0le2NvZGVjZGlyfQogCiAKICVjaGFuZ2Vsb2cKKyogU2F0IEFwciAx MyAyMDI0IFJvYmVydC1BbmRyw6kgTWF1Y2hpbiA8emVib2IubUBnbWFpbC5jb20+IC0gMS4yLjEz LTE0CistIEFkZCBwYXRjaCBmb3IgRkZNUEVHIDcgY29tcGF0aWJpbGl0eQorCiAqIFdlZCBNYXIg MTMgMjAyNCBTw6lyZ2lvIEJhc3RvIDxzZXJnaW9Ac2VyanV4LmNvbT4gLSAxLjIuMTMtMTMKIC0g UmVidWlsZCBmb3IganBlZ3hsIChsaWJqeGwpIDAuMTAuMgogCgo= --=_499bb8a337e0dd5263ddb3e14d2cef47 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline --=_499bb8a337e0dd5263ddb3e14d2cef47 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ xine-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/xine-devel --=_499bb8a337e0dd5263ddb3e14d2cef47--