From kde-multimedia Wed Jul 11 10:31:51 2001 From: Nikolas Zimmermann Date: Wed, 11 Jul 2001 10:31:51 +0000 To: kde-multimedia Subject: PATCH: Arts::VideoPlayObject + mpeglib adapted X-MARC-Message: https://marc.info/?l=kde-multimedia&m=99484797006939 MIME-Version: 1 Content-Type: multipart/mixed; boundary="--------------Boundary-00=_391BG37JVZ2BL52S9USH" --------------Boundary-00=_391BG37JVZ2BL52S9USH Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 8bit Hi guys, here is a patch, which adds support for Video Embedding, ie. into Konqueror. It's not stable, but this is a mpeglib issue! This patch is definately _not_ for KDE 2.2 but a kind of RFC and technology preview. Comments? Bye Bye Niko -- Nikolas Zimmermann wildfox@kde.org --------------Boundary-00=_391BG37JVZ2BL52S9USH Content-Type: text/x-diff; charset="iso-8859-1"; name="mpeglib.diff" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="mpeglib.diff" SW5kZXg6IGxpYi9kZWNvZGVyL2RlY29kZXJQbHVnaW4uaAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09ClJDUyBmaWxlOiAv aG9tZS9rZGUva2RlbXVsdGltZWRpYS9tcGVnbGliL2xpYi9kZWNvZGVyL2RlY29kZXJQbHVnaW4u aCx2CnJldHJpZXZpbmcgcmV2aXNpb24gMS4zCmRpZmYgLXUgLXAgLWIgLXIxLjMgZGVjb2RlclBs dWdpbi5oCi0tLSBsaWIvZGVjb2Rlci9kZWNvZGVyUGx1Z2luLmgJMjAwMC8xMS8yMyAxODo0Mzoy MAkxLjMKKysrIGxpYi9kZWNvZGVyL2RlY29kZXJQbHVnaW4uaAkyMDAxLzA3LzExIDEwOjM5OjA4 CkBAIC0xMjAsNiArMTIwLDkgQEAgY2xhc3MgRGVjb2RlclBsdWdpbiB7CiAgIGludCB3YWl0Rm9y U3RyZWFtU3RhdGUoaW50IHN0YXRlKTsKICAgUGx1Z2luSW5mbyogZ2V0UGx1Z2luSW5mbygpOwog CisgIC8vIE5lZWRlZCBmb3IgVmlkZW8gRW1iZWRkaW5nCisgIGludCB4MTFXaW5kb3dJZCgpIHsg cmV0dXJuIG91dHB1dC0+eDExV2luZG93SWQoKTsgfQorICAKICAgLy8gbmV2ZXIgdXNlIHRoaXMh CiAgIHZvaWQqIGlkbGVUaHJlYWQoKTsKIApJbmRleDogbGliL291dHB1dC9hcnRzT3V0cHV0U3Ry ZWFtLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09ClJDUyBmaWxlOiAvaG9tZS9rZGUva2RlbXVsdGltZWRpYS9tcGVn bGliL2xpYi9vdXRwdXQvYXJ0c091dHB1dFN0cmVhbS5jcHAsdgpyZXRyaWV2aW5nIHJldmlzaW9u IDEuOQpkaWZmIC11IC1wIC1iIC1yMS45IGFydHNPdXRwdXRTdHJlYW0uY3BwCi0tLSBsaWIvb3V0 cHV0L2FydHNPdXRwdXRTdHJlYW0uY3BwCTIwMDEvMDYvMTAgMTM6NDM6NDkJMS45CisrKyBsaWIv b3V0cHV0L2FydHNPdXRwdXRTdHJlYW0uY3BwCTIwMDEvMDcvMTEgMTA6Mzk6MDgKQEAgLTE0MSw2 ICsxNDEsOSBAQCBpbnQgQXJ0c091dHB1dFN0cmVhbTo6b3BlbldpbmRvdyhpbnQgd2lkCiAgIHJl dHVybiBiYWNrOwogfQogCitpbnQgQXJ0c091dHB1dFN0cmVhbTo6eDExV2luZG93SWQoKSB7Cisg cmV0dXJuIHgxMVdpbmRvdy0+eDExV2luZG93SWQoKTsKK30KIAogdm9pZCBBcnRzT3V0cHV0U3Ry ZWFtOjpjbG9zZVdpbmRvdygpIHsKICAgdGhyZWFkUXVldWUtPndhaXRGb3JFeGNsdXNpdmVBY2Nl c3MoKTsKSW5kZXg6IGxpYi9vdXRwdXQvYXJ0c091dHB1dFN0cmVhbS5oCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KUkNT IGZpbGU6IC9ob21lL2tkZS9rZGVtdWx0aW1lZGlhL21wZWdsaWIvbGliL291dHB1dC9hcnRzT3V0 cHV0U3RyZWFtLmgsdgpyZXRyaWV2aW5nIHJldmlzaW9uIDEuNApkaWZmIC11IC1wIC1iIC1yMS40 IGFydHNPdXRwdXRTdHJlYW0uaAotLS0gbGliL291dHB1dC9hcnRzT3V0cHV0U3RyZWFtLmgJMjAw MC8xMi8wNSAxNToyODo1OQkxLjQKKysrIGxpYi9vdXRwdXQvYXJ0c091dHB1dFN0cmVhbS5oCTIw MDEvMDcvMTEgMTA6Mzk6MDgKQEAgLTkzLDYgKzkzLDcgQEAgY2xhc3MgQXJ0c091dHB1dFN0cmVh bSA6IHB1YmxpYyBPdXRwdXRTdAogICAvLyBWaWRlbyBwYXJ0CiAKICAgaW50IG9wZW5XaW5kb3co aW50IHdpZHRoLCBpbnQgaGVpZ2h0LGNvbnN0IGNoYXIgKnRpdGxlKTsKKyAgaW50IHgxMVdpbmRv d0lkKCk7CiAgIHZvaWQgY2xvc2VXaW5kb3coKTsKICAgdm9pZCBmbHVzaFdpbmRvdygpOwogCklu ZGV4OiBsaWIvb3V0cHV0L2RzcFgxMU91dHB1dFN0cmVhbS5jcHAKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQpSQ1MgZmls ZTogL2hvbWUva2RlL2tkZW11bHRpbWVkaWEvbXBlZ2xpYi9saWIvb3V0cHV0L2RzcFgxMU91dHB1 dFN0cmVhbS5jcHAsdgpyZXRyaWV2aW5nIHJldmlzaW9uIDEuOQpkaWZmIC11IC1wIC1iIC1yMS45 IGRzcFgxMU91dHB1dFN0cmVhbS5jcHAKLS0tIGxpYi9vdXRwdXQvZHNwWDExT3V0cHV0U3RyZWFt LmNwcAkyMDAxLzA2LzA1IDE4OjU1OjM5CTEuOQorKysgbGliL291dHB1dC9kc3BYMTFPdXRwdXRT dHJlYW0uY3BwCTIwMDEvMDcvMTEgMTA6Mzk6MDgKQEAgLTEzOCw2ICsxMzgsMTAgQEAgaW50IERz cFgxMU91dHB1dFN0cmVhbTo6b3BlbldpbmRvdyhpbnQgdwogICByZXR1cm4gYmFjazsKIH0KIAor aW50IERzcFgxMU91dHB1dFN0cmVhbTo6eDExV2luZG93SWQoKSB7CisgIHJldHVybiB4MTFXaW5k b3ctPngxMVdpbmRvd0lkKCk7Cit9CisKIAogdm9pZCBEc3BYMTFPdXRwdXRTdHJlYW06OmNsb3Nl V2luZG93KCkgewogICB4MTFXaW5kb3ctPmNsb3NlV2luZG93KCk7CkluZGV4OiBsaWIvb3V0cHV0 L2RzcFgxMU91dHB1dFN0cmVhbS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KUkNTIGZpbGU6IC9ob21lL2tkZS9rZGVt dWx0aW1lZGlhL21wZWdsaWIvbGliL291dHB1dC9kc3BYMTFPdXRwdXRTdHJlYW0uaCx2CnJldHJp ZXZpbmcgcmV2aXNpb24gMS40CmRpZmYgLXUgLXAgLWIgLXIxLjQgZHNwWDExT3V0cHV0U3RyZWFt LmgKLS0tIGxpYi9vdXRwdXQvZHNwWDExT3V0cHV0U3RyZWFtLmgJMjAwMS8wNS8wMSAxNjoxMjo1 MQkxLjQKKysrIGxpYi9vdXRwdXQvZHNwWDExT3V0cHV0U3RyZWFtLmgJMjAwMS8wNy8xMSAxMDoz OTowOApAQCAtNjMsNiArNjMsNyBAQCBjbGFzcyBEc3BYMTFPdXRwdXRTdHJlYW0gOiBwdWJsaWMg T3V0cHV0CiAgIC8vIFZpZGVvIE91dHB1dAogCiAgIGludCBvcGVuV2luZG93KGludCB3aWR0aCwg aW50IGhlaWdodCxjb25zdCBjaGFyICp0aXRsZSk7CisgIGludCB4MTFXaW5kb3dJZCgpOwogICB2 b2lkIGNsb3NlV2luZG93KCk7CiAgIHZvaWQgZmx1c2hXaW5kb3coKTsKIApJbmRleDogbGliL291 dHB1dC9vdXRwdXRTdHJlYW0uY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KUkNTIGZpbGU6IC9ob21lL2tkZS9rZGVt dWx0aW1lZGlhL21wZWdsaWIvbGliL291dHB1dC9vdXRwdXRTdHJlYW0uY3BwLHYKcmV0cmlldmlu ZyByZXZpc2lvbiAxLjcKZGlmZiAtdSAtcCAtYiAtcjEuNyBvdXRwdXRTdHJlYW0uY3BwCi0tLSBs aWIvb3V0cHV0L291dHB1dFN0cmVhbS5jcHAJMjAwMS8wNi8xMCAxMzo0Mzo0OQkxLjcKKysrIGxp Yi9vdXRwdXQvb3V0cHV0U3RyZWFtLmNwcAkyMDAxLzA3LzExIDEwOjM5OjA4CkBAIC0xMzAsNiAr MTMwLDEwIEBAIGludCBPdXRwdXRTdHJlYW06Om9wZW5XaW5kb3coaW50ICwgaW50ICwKICAgcmV0 dXJuIHRydWU7CiB9CiAKK2ludCBPdXRwdXRTdHJlYW06OngxMVdpbmRvd0lkKCkgeworIGNvdXQg PDwgImRpcmVjdCB2aXJ0dWFsIGNhbGwgT3V0cHV0U3RyZWFtOjp4MTFXaW5kb3dJZCgpIiA8PCBl bmRsOworIHJldHVybiAtMTsKK30KIAogdm9pZCBPdXRwdXRTdHJlYW06OmNsb3NlV2luZG93KCkg ewogICBjZXJyIDw8ICJkaXJlY3QgdmlydHVhbCBjYWxsIE91dHB1dFN0cmVhbTo6Y2xvc2VXaW5k b3ciPDxlbmRsOwpJbmRleDogbGliL291dHB1dC9vdXRwdXRTdHJlYW0uaAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09ClJD UyBmaWxlOiAvaG9tZS9rZGUva2RlbXVsdGltZWRpYS9tcGVnbGliL2xpYi9vdXRwdXQvb3V0cHV0 U3RyZWFtLmgsdgpyZXRyaWV2aW5nIHJldmlzaW9uIDEuMwpkaWZmIC11IC1wIC1iIC1yMS4zIG91 dHB1dFN0cmVhbS5oCi0tLSBsaWIvb3V0cHV0L291dHB1dFN0cmVhbS5oCTIwMDAvMTEvMjMgMTg6 NDM6MjEJMS4zCisrKyBsaWIvb3V0cHV0L291dHB1dFN0cmVhbS5oCTIwMDEvMDcvMTEgMTA6Mzk6 MDgKQEAgLTExOCw2ICsxMTgsNyBAQCBjbGFzcyBPdXRwdXRTdHJlYW0gewogICAvLyBWaWRlbyBP dXRwdXQKICAgdmlydHVhbCBpbnQgdmlkZW9Jbml0KCk7CiAgIHZpcnR1YWwgaW50IG9wZW5XaW5k b3coaW50IHdpZHRoLCBpbnQgaGVpZ2h0LGNvbnN0IGNoYXIgKnRpdGxlKTsKKyAgdmlydHVhbCBp bnQgeDExV2luZG93SWQoKTsKICAgdmlydHVhbCB2b2lkIGNsb3NlV2luZG93KCk7CiAgIHZpcnR1 YWwgdm9pZCBmbHVzaFdpbmRvdygpOwogICAKSW5kZXg6IGxpYi9vdXRwdXQvd2luZG93T3V0LmNw cAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09ClJDUyBmaWxlOiAvaG9tZS9rZGUva2RlbXVsdGltZWRpYS9tcGVnbGliL2xp Yi9vdXRwdXQvd2luZG93T3V0LmNwcCx2CnJldHJpZXZpbmcgcmV2aXNpb24gMS4yCmRpZmYgLXUg LXAgLWIgLXIxLjIgd2luZG93T3V0LmNwcAotLS0gbGliL291dHB1dC93aW5kb3dPdXQuY3BwCTIw MDAvMDgvMDggMTY6MjE6MjgJMS4yCisrKyBsaWIvb3V0cHV0L3dpbmRvd091dC5jcHAJMjAwMS8w Ny8xMSAxMDozOTowOApAQCAtMzQsNiArMzQsOSBAQCBpbnQgV2luZG93T3V0OjpvcGVuV2luZG93 KGludCB3aWR0aCwgaW50CiAgIHJldHVybiByZW5kZXJNYWNoaW5lLT5vcGVuV2luZG93KHdpZHRo LGhlaWdodCx0aXRsZSk7CiB9CiAKK2ludCBXaW5kb3dPdXQ6OngxMVdpbmRvd0lkKCkgeworIHJl dHVybiByZW5kZXJNYWNoaW5lLT54MTFXaW5kb3dJZCgpOworfQogCiB2b2lkIFdpbmRvd091dDo6 Zmx1c2hXaW5kb3coKSB7CiAgIHJlbmRlck1hY2hpbmUtPmZsdXNoV2luZG93KCk7CkluZGV4OiBs aWIvb3V0cHV0L3dpbmRvd091dC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KUkNTIGZpbGU6IC9ob21lL2tkZS9rZGVt dWx0aW1lZGlhL21wZWdsaWIvbGliL291dHB1dC93aW5kb3dPdXQuaCx2CnJldHJpZXZpbmcgcmV2 aXNpb24gMS4zCmRpZmYgLXUgLXAgLWIgLXIxLjMgd2luZG93T3V0LmgKLS0tIGxpYi9vdXRwdXQv d2luZG93T3V0LmgJMjAwMC8wOC8wOCAxNjoyMToyOAkxLjMKKysrIGxpYi9vdXRwdXQvd2luZG93 T3V0LmgJMjAwMS8wNy8xMSAxMDozOTowOApAQCAtMzUsNiArMzUsNyBAQCBjbGFzcyBXaW5kb3dP dXQgewogICB+V2luZG93T3V0KCk7CiAKICAgaW50IG9wZW5XaW5kb3coaW50IHdpZHRoLCBpbnQg aGVpZ2h0LGNvbnN0IGNoYXIgKnRpdGxlKTsKKyAgaW50IHgxMVdpbmRvd0lkKCk7CiAgIHZvaWQg Y2xvc2VXaW5kb3coKTsKICAgdm9pZCBmbHVzaFdpbmRvdygpOwogCkluZGV4OiBsaWIvdXRpbC9y ZW5kZXIvcmVuZGVyTWFjaGluZS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQpSQ1MgZmlsZTogL2hvbWUva2RlL2tk ZW11bHRpbWVkaWEvbXBlZ2xpYi9saWIvdXRpbC9yZW5kZXIvcmVuZGVyTWFjaGluZS5jcHAsdgpy ZXRyaWV2aW5nIHJldmlzaW9uIDEuMTAKZGlmZiAtdSAtcCAtYiAtcjEuMTAgcmVuZGVyTWFjaGlu ZS5jcHAKLS0tIGxpYi91dGlsL3JlbmRlci9yZW5kZXJNYWNoaW5lLmNwcAkyMDAxLzAxLzA3IDE5 OjU2OjI0CTEuMTAKKysrIGxpYi91dGlsL3JlbmRlci9yZW5kZXJNYWNoaW5lLmNwcAkyMDAxLzA3 LzExIDEwOjM5OjA5CkBAIC01OCwxMyArNTgsMTUgQEAgdm9pZCBSZW5kZXJNYWNoaW5lOjp3YWl0 UmVzdFRpbWUoKSB7CiAKIH0KIAoraW50IFJlbmRlck1hY2hpbmU6OngxMVdpbmRvd0lkKCkKK3sK KwlyZXR1cm4gc3VyZmFjZS0+eDExV2luZG93SWQoKTsKK30KIAogCi0KIGludCBSZW5kZXJNYWNo aW5lOjpvcGVuV2luZG93KGludCB3aWR0aCwgCiAJCQkgICAgICBpbnQgaGVpZ2h0LGNvbnN0IGNo YXIgKnRpdGxlKSB7Ci0KLSAgaWYgKHN1cmZhY2UtPm9wZW4od2lkdGgsaGVpZ2h0LHRpdGxlKSkg eworaWYgKHN1cmZhY2UtPm9wZW4od2lkdGgsaGVpZ2h0LHRpdGxlKSkgewogICAgIHBpY3R1cmVB cnJheT1uZXcgUGljdHVyZUFycmF5KHdpZHRoLCBoZWlnaHQpOwogICAgIAogICAgIHJldHVybiBz d2l0Y2hUb01vZGUoaW5pdGlhbE1vZGUpOwpJbmRleDogbGliL3V0aWwvcmVuZGVyL3JlbmRlck1h Y2hpbmUuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09ClJDUyBmaWxlOiAvaG9tZS9rZGUva2RlbXVsdGltZWRpYS9tcGVn bGliL2xpYi91dGlsL3JlbmRlci9yZW5kZXJNYWNoaW5lLmgsdgpyZXRyaWV2aW5nIHJldmlzaW9u IDEuNQpkaWZmIC11IC1wIC1iIC1yMS41IHJlbmRlck1hY2hpbmUuaAotLS0gbGliL3V0aWwvcmVu ZGVyL3JlbmRlck1hY2hpbmUuaAkyMDAwLzEyLzA2IDE4OjQyOjA3CTEuNQorKysgbGliL3V0aWwv cmVuZGVyL3JlbmRlck1hY2hpbmUuaAkyMDAxLzA3LzExIDEwOjM5OjA5CkBAIC03MCw2ICs3MCw3 IEBAIGNsYXNzIFJlbmRlck1hY2hpbmUgewogICB+UmVuZGVyTWFjaGluZSgpOwogCiAgIGludCBv cGVuV2luZG93KGludCB3aWR0aCwgaW50IGhlaWdodCxjb25zdCBjaGFyICp0aXRsZSk7CisgIGlu dCB4MTFXaW5kb3dJZCgpOwogICB2b2lkIGNsb3NlV2luZG93KCk7CiAgIHZvaWQgZmx1c2hXaW5k b3coKTsKIApJbmRleDogbGliL3V0aWwvcmVuZGVyL3N1cmZhY2UuY3BwCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KUkNT IGZpbGU6IC9ob21lL2tkZS9rZGVtdWx0aW1lZGlhL21wZWdsaWIvbGliL3V0aWwvcmVuZGVyL3N1 cmZhY2UuY3BwLHYKcmV0cmlldmluZyByZXZpc2lvbiAxLjQKZGlmZiAtdSAtcCAtYiAtcjEuNCBz dXJmYWNlLmNwcAotLS0gbGliL3V0aWwvcmVuZGVyL3N1cmZhY2UuY3BwCTIwMDAvMTIvMDYgMTg6 NDI6MDcJMS40CisrKyBsaWIvdXRpbC9yZW5kZXIvc3VyZmFjZS5jcHAJMjAwMS8wNy8xMSAxMDoz OTowOQpAQCAtNjUsNiArNjUsMTEgQEAgaW50IFN1cmZhY2U6OmdldEltYWdlTW9kZSgpIHsKICAg cmV0dXJuIDA7CiB9CiAKK2ludCBTdXJmYWNlOjp4MTFXaW5kb3dJZCgpIHsKKyAgY291dCA8PCAi ZGlyZWN0IHZpcnR1YWwgY2FsbCAgU3VyZmFjZTo6eDExV2luZG93SWQgIiA8PCBlbmRsOworICBy ZXR1cm4gLTE7Cit9CisKIEltYWdlQmFzZSAqU3VyZmFjZTo6ZmluZEltYWdlKGludCkKIHsKICAg Y291dCA8PCAiZGlyZWN0IHZpcnR1YWwgY2FsbDogU3VyZmFjZTo6ZmluZEltYWdlICAiPDxlbmRs OwpJbmRleDogbGliL3V0aWwvcmVuZGVyL3N1cmZhY2UuaAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09ClJDUyBmaWxlOiAv aG9tZS9rZGUva2RlbXVsdGltZWRpYS9tcGVnbGliL2xpYi91dGlsL3JlbmRlci9zdXJmYWNlLmgs dgpyZXRyaWV2aW5nIHJldmlzaW9uIDEuMwpkaWZmIC11IC1wIC1iIC1yMS4zIHN1cmZhY2UuaAot LS0gbGliL3V0aWwvcmVuZGVyL3N1cmZhY2UuaAkyMDAwLzEyLzA2IDE4OjQyOjA3CTEuMworKysg bGliL3V0aWwvcmVuZGVyL3N1cmZhY2UuaAkyMDAxLzA3LzExIDEwOjM5OjA5CkBAIC0zNyw2ICsz Nyw3IEBAIGNsYXNzIFN1cmZhY2UgewogICB2aXJ0dWFsIGludCBnZXRXaWR0aCgpOwogICB2aXJ0 dWFsIGludCBnZXREZXB0aCgpOwogICB2aXJ0dWFsIGludCBnZXRJbWFnZU1vZGUoKTsKKyAgdmly dHVhbCBpbnQgeDExV2luZG93SWQoKTsKIAogICB2aXJ0dWFsIEltYWdlQmFzZSAqZmluZEltYWdl KGludCBpbWFnZU1vZGUpOwogCkluZGV4OiBsaWIvdXRpbC9yZW5kZXIveDExL3gxMVN1cmZhY2Uu Y3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KUkNTIGZpbGU6IC9ob21lL2tkZS9rZGVtdWx0aW1lZGlhL21wZWdsaWIv bGliL3V0aWwvcmVuZGVyL3gxMS94MTFTdXJmYWNlLmNwcCx2CnJldHJpZXZpbmcgcmV2aXNpb24g MS4xNwpkaWZmIC11IC1wIC1iIC1yMS4xNyB4MTFTdXJmYWNlLmNwcAotLS0gbGliL3V0aWwvcmVu ZGVyL3gxMS94MTFTdXJmYWNlLmNwcAkyMDAxLzAyLzI1IDE5OjE3OjI3CTEuMTcKKysrIGxpYi91 dGlsL3JlbmRlci94MTEveDExU3VyZmFjZS5jcHAJMjAwMS8wNy8xMSAxMDozOTowOQpAQCAtMzgs MTAgKzM4LDExIEBAIHN0YXRpYyBpbnQgZHVtbXkoRGlzcGxheSogLCBYRXJyb3JFdmVudCoKICNl bmRpZgogCiBYMTFTdXJmYWNlOjpYMTFTdXJmYWNlKCkgewotCiAgIHhXaW5kb3c9KFhXaW5kb3cg KiltYWxsb2Moc2l6ZW9mKFhXaW5kb3cpKTsKICAgeFdpbmRvdy0+bE9wZW49ZmFsc2U7CiAgIHhX aW5kb3ctPnggPSB4V2luZG93LT55ID0gMDsKKyAgeFdpbmRvdy0+d2luZG93ID0gMDsKKyAgbV93 aW5kb3dJZEF2YWlsYWJsZSA9IGZhbHNlOwogICAKICAgaW1hZ2VNb2RlPV9JTUFHRV9OT05FOwog CkBAIC05MSw2ICs5MiwxMiBAQCBpbnQgWDExU3VyZmFjZTo6aXNPcGVuKCkgewogICByZXR1cm4g eFdpbmRvdy0+bE9wZW47CiB9CiAKK2ludCBYMTFTdXJmYWNlOjp4MTFXaW5kb3dJZCgpIHsKKyAg aWYobV93aW5kb3dJZEF2YWlsYWJsZSkKKyAgCXJldHVybiB4V2luZG93LT53aW5kb3c7CisgIGVs c2UKKyAgICByZXR1cm4gLTE7Cit9CiAKIGludCBYMTFTdXJmYWNlOjpvcGVuKGludCB3aWR0aCwg aW50IGhlaWdodCxjb25zdCBjaGFyICp0aXRsZSwgYm9vbCBib3JkZXIpIHsKIApAQCAtMTQ3LDYg KzE1NCw3IEBAIGludCBYMTFTdXJmYWNlOjpvcGVuKGludCB3aWR0aCwgaW50IGhlaWcKIAkJCQko Ym9yZGVyKSA/IENXQmFja2luZ1N0b3JlIDogQ1dCYWNrUGl4ZWx8Q1dPdmVycmlkZVJlZGlyZWN0 LAogCQkJCSZhdHRyaWJ1dGVzKTsKICAgCisgIG1fd2luZG93SWRBdmFpbGFibGUgPSB0cnVlOwog ICBpZigheFdpbmRvdy0+d2luZG93KSB7CiAgICAgcHJpbnRmKCJcblggaW5pdGlhbGlzYXRpb24g ZXJyb3I6XG4gKioqICVzXG4iLEVSUl9YSV9TVFJbRVJSX1hJX1dJTkRPV10pOwogICAgIHByaW50 ZigiY2hlY2sgaXBjcyBhbmQgZGVsZXRlIHJlc291cmNlcyB3aXRoIGlwY3JtXG4iKTsgCkluZGV4 OiBsaWIvdXRpbC9yZW5kZXIveDExL3gxMVN1cmZhY2UuaAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09ClJDUyBmaWxlOiAv aG9tZS9rZGUva2RlbXVsdGltZWRpYS9tcGVnbGliL2xpYi91dGlsL3JlbmRlci94MTEveDExU3Vy ZmFjZS5oLHYKcmV0cmlldmluZyByZXZpc2lvbiAxLjQKZGlmZiAtdSAtcCAtYiAtcjEuNCB4MTFT dXJmYWNlLmgKLS0tIGxpYi91dGlsL3JlbmRlci94MTEveDExU3VyZmFjZS5oCTIwMDAvMTIvMDYg MTg6NDI6MDgJMS40CisrKyBsaWIvdXRpbC9yZW5kZXIveDExL3gxMVN1cmZhY2UuaAkyMDAxLzA3 LzExIDEwOjM5OjA5CkBAIC01Miw2ICs1Miw3IEBAIGNsYXNzIFgxMVN1cmZhY2UgOiBwdWJsaWMg U3VyZmFjZSB7CiAgIGludCBnZXRXaWR0aCgpOwogICBpbnQgZ2V0RGVwdGgoKTsKICAgaW50IGdl dEltYWdlTW9kZSgpOworICBpbnQgeDExV2luZG93SWQoKTsKICAgCiAgIEltYWdlQmFzZSAqZmlu ZEltYWdlKGludCBtb2RlKTsKIAkgIApAQCAtNzMsNSArNzQsNiBAQCBjbGFzcyBYMTFTdXJmYWNl IDogcHVibGljIFN1cmZhY2UgewogCiAgcHJpdmF0ZToKICAgaW50IGluaXRYMTEoKTsKKyAgYm9v bCBtX3dpbmRvd0lkQXZhaWxhYmxlOwogfTsKICNlbmRpZgo= --------------Boundary-00=_391BG37JVZ2BL52S9USH Content-Type: text/x-diff; charset="iso-8859-1"; name="mpeglib_artsplug.diff" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="mpeglib_artsplug.diff" SW5kZXg6IGRlY29kZXJCYXNlT2JqZWN0LmlkbAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09ClJDUyBmaWxlOiAvaG9tZS9r ZGUva2RlbXVsdGltZWRpYS9tcGVnbGliX2FydHNwbHVnL2RlY29kZXJCYXNlT2JqZWN0LmlkbCx2 CnJldHJpZXZpbmcgcmV2aXNpb24gMS42CmRpZmYgLXUgLXAgLWIgLXIxLjYgZGVjb2RlckJhc2VP YmplY3QuaWRsCi0tLSBkZWNvZGVyQmFzZU9iamVjdC5pZGwJMjAwMS8wNi8xMyAxOTozODo1Ngkx LjYKKysrIGRlY29kZXJCYXNlT2JqZWN0LmlkbAkyMDAxLzA3LzExIDEwOjM4OjQ5CkBAIC0yOSw3 ICsyOSw3IEBAIGludGVyZmFjZSBXQVZQbGF5T2JqZWN0IDogRGVjb2RlckJhc2VPYmoKIH07CiAK IAotaW50ZXJmYWNlIE1QR1BsYXlPYmplY3QgOiBEZWNvZGVyQmFzZU9iamVjdAoraW50ZXJmYWNl IE1QR1BsYXlPYmplY3QgOiBEZWNvZGVyQmFzZU9iamVjdCwgQXJ0czo6VmlkZW9QbGF5T2JqZWN0 CiB7CiAgIG91dCBhdWRpbyBzdHJlYW0gbGVmdCxyaWdodDsKIH07CkluZGV4OiBkZWNvZGVyQmFz ZU9iamVjdF9pbXBsLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09ClJDUyBmaWxlOiAvaG9tZS9rZGUva2RlbXVsdGlt ZWRpYS9tcGVnbGliX2FydHNwbHVnL2RlY29kZXJCYXNlT2JqZWN0X2ltcGwuY3BwLHYKcmV0cmll dmluZyByZXZpc2lvbiAxLjIyCmRpZmYgLXUgLXAgLWIgLXIxLjIyIGRlY29kZXJCYXNlT2JqZWN0 X2ltcGwuY3BwCi0tLSBkZWNvZGVyQmFzZU9iamVjdF9pbXBsLmNwcAkyMDAxLzA2LzEzIDE5OjM4 OjU2CTEuMjIKKysrIGRlY29kZXJCYXNlT2JqZWN0X2ltcGwuY3BwCTIwMDEvMDcvMTEgMTA6Mzg6 NTIKQEAgLTQ2NCw4ICs0NjQsNiBAQCB2b2lkIERlY29kZXJCYXNlT2JqZWN0X2ltcGw6OnNodWRv d25QbHVnCiAgIHNldFN0cmVhbVN0YXRlKF9USFJFQURTVEFURV9DTE9TRUQpOwogfQogCi0KLQog dm9pZCBEZWNvZGVyQmFzZU9iamVjdF9pbXBsOjpzZXRTdHJlYW1TdGF0ZShpbnQgc3RhdGUpIHsK IAogICBzd2l0Y2ggKHN0YXRlKSB7CkluZGV4OiBkZWNvZGVyQmFzZU9iamVjdF9pbXBsLmgKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQpSQ1MgZmlsZTogL2hvbWUva2RlL2tkZW11bHRpbWVkaWEvbXBlZ2xpYl9hcnRzcGx1 Zy9kZWNvZGVyQmFzZU9iamVjdF9pbXBsLmgsdgpyZXRyaWV2aW5nIHJldmlzaW9uIDEuMTAKZGlm ZiAtdSAtcCAtYiAtcjEuMTAgZGVjb2RlckJhc2VPYmplY3RfaW1wbC5oCi0tLSBkZWNvZGVyQmFz ZU9iamVjdF9pbXBsLmgJMjAwMS8wNi8xMyAxOTozODo1NgkxLjEwCisrKyBkZWNvZGVyQmFzZU9i amVjdF9pbXBsLmgJMjAwMS8wNy8xMSAxMDozODo1MgpAQCAtNDgsMTEgKzQ4LDEwIEBAIGNsYXNz IERlY29kZXJCYXNlT2JqZWN0X2ltcGwgOgogICB2aXJ0dWFsIHB1YmxpYyBBcnRzOjpTdGRTeW50 aE1vZHVsZSwKICAgdmlydHVhbCBwdWJsaWMgRGVjb2RlckJhc2VPYmplY3Rfc2tlbCB7CiAKLQog ICBwb1N0YXRlIF9zdGF0ZTsKLSAgRGVjb2RlclBsdWdpbiogZGVjb2RlclBsdWdpbjsKICAgSW5w dXRTdHJlYW0qIGlucHV0U3RyZWFtOwogICBBcnRzT3V0cHV0U3RyZWFtKiBvdXRwdXRTdHJlYW07 CisgIAogICBkb3VibGUgZmxwb3M7CiAgIGZsb2F0IHN0YXJ0VGltZTsKICAgaW50IGluc3RhbmNl OwpAQCAtOTYsNiArOTUsOCBAQCBwdWJsaWM6CiAgIHZvaWQgY2FsY3VsYXRlQmxvY2sodW5zaWdu ZWQgbG9uZyBzYW1wbGVzLGZsb2F0KiBsZWZ0LGZsb2F0KiByaWdodCk7CiAgIHZvaWQgc3RyZWFt RW5kKCk7CiAKKyAgRGVjb2RlclBsdWdpbiogZGVjb2RlclBsdWdpbjsKKyAgCiAgcHJpdmF0ZToK ICAgdm9pZCBzaHVkb3duUGx1Z2lucygpOwogICBpbnQgZ2V0QnVmZmVyU2l6ZSgpOwpJbmRleDog bXBnUGxheU9iamVjdF9pbXBsLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09ClJDUyBmaWxlOiAvaG9tZS9rZGUva2Rl bXVsdGltZWRpYS9tcGVnbGliX2FydHNwbHVnL21wZ1BsYXlPYmplY3RfaW1wbC5jcHAsdgpyZXRy aWV2aW5nIHJldmlzaW9uIDEuMgpkaWZmIC11IC1wIC1iIC1yMS4yIG1wZ1BsYXlPYmplY3RfaW1w bC5jcHAKLS0tIG1wZ1BsYXlPYmplY3RfaW1wbC5jcHAJMjAwMC8wOS8zMCAyMDo0NToxMAkxLjIK KysrIG1wZ1BsYXlPYmplY3RfaW1wbC5jcHAJMjAwMS8wNy8xMSAxMDozODo1MgpAQCAtMjAsNiAr MjAsNyBAQAogCiBNUEdQbGF5T2JqZWN0X2ltcGw6Ok1QR1BsYXlPYmplY3RfaW1wbCgpIHsKICAg YXJ0c19kZWJ1ZygiTVBHUGxheU9iamVjdF9pbXBsIik7CisgIG1fZnVsbHNjcmVlbiA9IGZhbHNl OwogfQogCiBNUEdQbGF5T2JqZWN0X2ltcGw6On5NUEdQbGF5T2JqZWN0X2ltcGwoKSB7CkBAIC0z NSw2ICszNiwxNyBAQCB2b2lkIE1QR1BsYXlPYmplY3RfaW1wbDo6Y2FsY3VsYXRlQmxvY2soCiAg IERlY29kZXJCYXNlT2JqZWN0X2ltcGw6OmNhbGN1bGF0ZUJsb2NrKHNhbXBsZXMsbGVmdCxyaWdo dCk7CiB9CiAKK2xvbmcgaW50IE1QR1BsYXlPYmplY3RfaW1wbDo6eDExV2luZG93SWQoKSB7Cisg cmV0dXJuIGRlY29kZXJQbHVnaW4tPngxMVdpbmRvd0lkKCk7Cit9CisKK2Jvb2wgTVBHUGxheU9i amVjdF9pbXBsOjpmdWxsc2NyZWVuKCkgeworIHJldHVybiBtX2Z1bGxzY3JlZW47Cit9CisKK3Zv aWQgTVBHUGxheU9iamVjdF9pbXBsOjpmdWxsc2NyZWVuKGJvb2wgdmFsdWUpIHsKKyBtX2Z1bGxz Y3JlZW4gPSB2YWx1ZTsKK30KIAogCiBSRUdJU1RFUl9JTVBMRU1FTlRBVElPTihNUEdQbGF5T2Jq ZWN0X2ltcGwpOwpJbmRleDogbXBnUGxheU9iamVjdF9pbXBsLmgKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQpSQ1MgZmls ZTogL2hvbWUva2RlL2tkZW11bHRpbWVkaWEvbXBlZ2xpYl9hcnRzcGx1Zy9tcGdQbGF5T2JqZWN0 X2ltcGwuaCx2CnJldHJpZXZpbmcgcmV2aXNpb24gMS4zCmRpZmYgLXUgLXAgLWIgLXIxLjMgbXBn UGxheU9iamVjdF9pbXBsLmgKLS0tIG1wZ1BsYXlPYmplY3RfaW1wbC5oCTIwMDEvMDUvMDEgMTE6 MDc6MTUJMS4zCisrKyBtcGdQbGF5T2JqZWN0X2ltcGwuaAkyMDAxLzA3LzExIDEwOjM4OjUyCkBA IC0zMyw5ICszMywxNCBAQCBwdWJsaWM6CiAKICAgRGVjb2RlclBsdWdpbiogY3JlYXRlUGx1Z2lu KCk7CiAKKyAgbG9uZyBpbnQgeDExV2luZG93SWQoKTsKKyAgdm9pZCBmdWxsc2NyZWVuKGJvb2wg dmFsdWUpOworICBib29sIGZ1bGxzY3JlZW4oKTsKIAotCiAgIHZvaWQgY2FsY3VsYXRlQmxvY2so dW5zaWduZWQgbG9uZyBzYW1wbGVzKTsKKworcHJpdmF0ZToKKyAgYm9vbCBtX2Z1bGxzY3JlZW47 CiAKIH07CiAK --------------Boundary-00=_391BG37JVZ2BL52S9USH Content-Type: text/x-diff; charset="iso-8859-1"; name="kaboodle.diff" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="kaboodle.diff" PyB2aWRlb2VtYmVkLmNwcAo/IHZpZGVvZW1iZWQuaApJbmRleDogTWFrZWZpbGUuYW0KPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQpSQ1MgZmlsZTogL2hvbWUva2RlL2tkZW5vbmJldGEva2Fib29kbGUvTWFrZWZpbGUuYW0s dgpyZXRyaWV2aW5nIHJldmlzaW9uIDEuMTEKZGlmZiAtdSAtcCAtYiAtcjEuMTEgTWFrZWZpbGUu YW0KLS0tIE1ha2VmaWxlLmFtCTIwMDEvMDcvMTEgMDM6MjQ6MjIJMS4xMQorKysgTWFrZWZpbGUu YW0JMjAwMS8wNy8xMSAxMDozODowOApAQCAtOSw3ICs5LDggQEAgbGlia2Fib29kbGVwYXJ0X2xh X1NPVVJDRVMgPSBjb25mLmNwcCBcCiAJZW5naW5lLmNwcCBcCiAJa2Fib29kbGVfZmFjdG9yeS5j cHAgXAogCWthYm9vZGxlX3BhcnQuY3BwIFwKLQlwbGF5ZXIuY3BwCisJcGxheWVyLmNwcCBcCisJ dmlkZW9lbWJlZC5jcHAKIAogbGlia2Fib29kbGVwYXJ0X2xhX0xERkxBR1MgPSAkKEtERV9SUEFU SCkgJChLREVfUExVR0lOKSAkKGFsbF9saWJyYXJpZXMpIAogbGlia2Fib29kbGVwYXJ0X2xhX0xJ QkFERCA9ICQoTElCX0tGSUxFKSAkKExJQl9LUEFSVFMpIC1scXRtY29wIC1sa21lZGlhMl9pZGwg LWxzb3VuZHNlcnZlcl9pZGwgLWxhcnRza2RlCkluZGV4OiBlbmdpbmUuY3BwCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K UkNTIGZpbGU6IC9ob21lL2tkZS9rZGVub25iZXRhL2thYm9vZGxlL2VuZ2luZS5jcHAsdgpyZXRy aWV2aW5nIHJldmlzaW9uIDEuMTUKZGlmZiAtdSAtcCAtYiAtcjEuMTUgZW5naW5lLmNwcAotLS0g ZW5naW5lLmNwcAkyMDAxLzA3LzA2IDIxOjMwOjUzCTEuMTUKKysrIGVuZ2luZS5jcHAJMjAwMS8w Ny8xMSAxMDozODoxMApAQCAtMzMsNiArMzMsNyBAQCBleHRlcm4gIkMiCiAjaW5jbHVkZSA8a21p bWV0eXBlLmg+CiAjaW5jbHVkZSA8a3N0ZGRpcnMuaD4KICNpbmNsdWRlIDxrdXJsLmg+CisjaW5j bHVkZSA8cXRpbWVyLmg+CiAjaW5jbHVkZSA8cWZpbGUuaD4KICNpbmNsdWRlIDxxZGlyLmg+CiAK QEAgLTc5LDYgKzgwLDggQEAgRW5naW5lOjpFbmdpbmUoUU9iamVjdCAqcGFyZW50KQogCQlLTWVz c2FnZUJveDo6ZXJyb3IoMCwgaTE4bigiVGhlcmUgd2FzIGFuIGVycm9yIGNvbW11bmljYXRpbmcg dG8gdGhlIGFSdHMgZGFlbW9uLiIpLCBpMThuKCJEYW5nZXIsIFdpbGwgUm9iaW5zb24hIikpOwog CQlleGl0KDApOwogCX0KKworCW1fdmlkZW9FbWJlZGRhYmxlID0gZmFsc2U7CiB9CiAKIEVuZ2lu ZTo6fkVuZ2luZSgpCkBAIC0xMDQsOSArMTA3LDI2IEBAIGJvb2wgRW5naW5lOjpyZWxvYWQodm9p ZCkKIAlpZighaW5pdEFydHMoKSkgcmV0dXJuIGZhbHNlOwogCUtQbGF5T2JqZWN0RmFjdG9yeSBm YWN0b3J5KGQtPnNlcnZlcik7CiAJZC0+cGxheW9iaiA9IGZhY3RvcnkuY3JlYXRlUGxheU9iamVj dChkLT5maWxlLCB0cnVlKTsKKwkKKwkvLyBFbWJlZGRhYmxlIFZpZGVvIFN1cHBvcnQKKwlBcnRz OjpWaWRlb1BsYXlPYmplY3QgcG8gPSBBcnRzOjpEeW5hbWljQ2FzdChkLT5wbGF5b2JqLT5vYmpl Y3QoKSk7CisJaWYoIXBvLmlzTnVsbCgpKQorCQltX3ZpZGVvRW1iZWRkYWJsZSA9IHRydWU7CisJ ZWxzZQorCQltX3ZpZGVvRW1iZWRkYWJsZSA9IGZhbHNlOworCiAJcmV0dXJuICFkLT5wbGF5b2Jq LT5vYmplY3QoKS5pc051bGwoKTsKIH0KIAordm9pZCBFbmdpbmU6OmdldFZpZGVvSWQoKQorewor CUFydHM6OlZpZGVvUGxheU9iamVjdCBwbyA9IEFydHM6OkR5bmFtaWNDYXN0KGQtPnBsYXlvYmot Pm9iamVjdCgpKTsKKwlpZihwby54MTFXaW5kb3dJZCgpICE9IC0xKQorCQllbWl0IHgxMVdpbmRv d0lkKHBvLngxMVdpbmRvd0lkKCkpOworCWVsc2UKKwkJUVRpbWVyOjpzaW5nbGVTaG90KDAsIHRo aXMsIFNMT1QoZ2V0VmlkZW9JZCgpKSk7Cit9CisKIHZvaWQgRW5naW5lOjpwbGF5KCkKIHsKIAlp ZighZC0+cGxheW9iai0+b2JqZWN0KCkuaXNOdWxsKCkpCkBAIC0xMTQsOCArMTM0LDE5IEBAIHZv aWQgRW5naW5lOjpwbGF5KCkKIAkJc3dpdGNoKGQtPnBsYXlvYmotPnN0YXRlKCkpCiAJCXsKIAkJ Y2FzZSBBcnRzOjpwb3NJZGxlOgorCQkJewogCQkJcmVsb2FkKCk7Ci0JCQkvLyBmYWxsdGhyb3Vn aAorCQkJCUFydHM6OlZpZGVvUGxheU9iamVjdCBwbyA9IEFydHM6OkR5bmFtaWNDYXN0KGQtPnBs YXlvYmotPm9iamVjdCgpKTsKKwkJCQlkLT5wbGF5b2JqLT5wbGF5KCk7CisJCQkJaWYoIXBvLmlz TnVsbCgpKQorCQkJCXsKKwkJCQkJaWYocG8ueDExV2luZG93SWQoKSAhPSAtMSkKKwkJCQkJCWVt aXQgeDExV2luZG93SWQocG8ueDExV2luZG93SWQoKSk7CisJCQkJCWVsc2UKKwkJCQkJCVFUaW1l cjo6c2luZ2xlU2hvdCgwLCB0aGlzLCBTTE9UKGdldFZpZGVvSWQoKSkpOworCQkJCX0KKwkJCX0K KwkJCWJyZWFrOwogCQljYXNlIEFydHM6OnBvc1BhdXNlZDoKIAkJCWQtPnBsYXlvYmotPnBsYXko KTsKIAkJCWJyZWFrOwpJbmRleDogZW5naW5lLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQpSQ1MgZmlsZTogL2hvbWUv a2RlL2tkZW5vbmJldGEva2Fib29kbGUvZW5naW5lLmgsdgpyZXRyaWV2aW5nIHJldmlzaW9uIDEu MwpkaWZmIC11IC1wIC1iIC1yMS4zIGVuZ2luZS5oCi0tLSBlbmdpbmUuaAkyMDAxLzA0LzIzIDE5 OjAwOjMwCTEuMworKysgZW5naW5lLmgJMjAwMS8wNy8xMSAxMDozODoxMApAQCAtODUsMTAgKzg1 LDE4IEBAIHB1YmxpYzoKIAlsb25nIHBvc2l0aW9uKCk7IC8vIE5PVCB1bnNpZ25lZAogCXVuc2ln bmVkIGxvbmcgbGVuZ3RoKCk7CiAKK3NpZ25hbHM6CisJdm9pZCB4MTFXaW5kb3dJZChpbnQpOwor Citwcml2YXRlIHNsb3RzOgorCXZvaWQgZ2V0VmlkZW9JZCgpOworCQogcHJpdmF0ZToKIAlib29s IGluaXRBcnRzKCk7CiAJYm9vbCByZWxvYWQodm9pZCk7CiAKKwlib29sIG1fdmlkZW9FbWJlZGRh YmxlOworCQogCWNsYXNzIEVuZ2luZVByaXZhdGU7CiAJRW5naW5lUHJpdmF0ZSAqZDsKIH07Cklu ZGV4OiBrYWJvb2RsZV9wYXJ0LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09ClJDUyBmaWxlOiAvaG9tZS9rZGUva2Rl bm9uYmV0YS9rYWJvb2RsZS9rYWJvb2RsZV9wYXJ0LmNwcCx2CnJldHJpZXZpbmcgcmV2aXNpb24g MS4xOApkaWZmIC11IC1wIC1iIC1yMS4xOCBrYWJvb2RsZV9wYXJ0LmNwcAotLS0ga2Fib29kbGVf cGFydC5jcHAJMjAwMS8wNy8wNiAyMToyNzoyNgkxLjE4CisrKyBrYWJvb2RsZV9wYXJ0LmNwcAky MDAxLzA3LzExIDEwOjM4OjEwCkBAIC0zNSw2ICszNSw3IEBAIENPTk5FQ1RJT04gV0lUSCBUSEUg U09GVFdBUkUgT1IgVEhFIFVTRSAKICNpbmNsdWRlIDxxdG9vbHRpcC5oPgogI2luY2x1ZGUgPHF3 aWRnZXQuaD4KIAorI2luY2x1ZGUgImVuZ2luZS5oIgogI2luY2x1ZGUgImthYm9vZGxlX3BhcnQu aCIKIAogc3RhdGljIFFCdXR0b24gKmNyZWF0ZUJ1dHRvbihjb25zdCBRSWNvblNldCAmX2ljb25z ZXQsIGNvbnN0IFFTdHJpbmcgJl90aXAsIFFPYmplY3QgKl9yZWNlaXZlciwgY29uc3QgY2hhciAq X3Nsb3QsIFFXaWRnZXQgKl9wYXJlbnQpCkBAIC01NCw0MSArNTUsNDcgQEAgS2Fib29kbGVQYXJ0 OjpLYWJvb2RsZVBhcnQoUVdpZGdldCAqcGFyZQogCSwgbVBsYXlCdXR0b24oMCkKIAksIG1QYXVz ZUJ1dHRvbigwKQogCSwgbVN0b3BCdXR0b24oMCkKKwksIG1fdmlkZW9FbWJlZCgwKQogewogCXNl dEluc3RhbmNlKEthYm9vZGxlRmFjdG9yeTo6aW5zdGFuY2UoKSk7CiAKIAlwbGF5ZXIgPSBuZXcg UGxheWVyKHRoaXMpOwogCi0JUVdpZGdldCAqYm94ID0gbmV3IFFXaWRnZXQocGFyZW50KTsKLQli b3gtPnNldEZvY3VzUG9saWN5KFFXaWRnZXQ6OkNsaWNrRm9jdXMpOwotCWJveC0+c2V0QWNjZXB0 RHJvcHModHJ1ZSk7Ci0JYm94LT5zaG93KCk7CisJbV9oYm94ID0gbmV3IFFIQm94KHBhcmVudCk7 CisJbV9oYm94LT5zZXRTcGFjaW5nKEtEaWFsb2c6OnNwYWNpbmdIaW50KCkpOworCW1faGJveC0+ c2V0TWFyZ2luKEtEaWFsb2c6Om1hcmdpbkhpbnQoKSk7CisKKwltX2JveCA9IG5ldyBRV2lkZ2V0 KG1faGJveCk7CisJbV9ib3gtPnNldEZvY3VzUG9saWN5KFFXaWRnZXQ6OkNsaWNrRm9jdXMpOwor CW1fYm94LT5zZXRBY2NlcHREcm9wcyh0cnVlKTsKIAotCUtQYXJ0czo6UGFydDo6c2V0V2lkZ2V0 KGJveCk7CisJUUhCb3hMYXlvdXQgKmxheW91dCA9IG5ldyBRSEJveExheW91dChtX2JveCk7CisJ bGF5b3V0LT5zZXRTcGFjaW5nKEtEaWFsb2c6OnNwYWNpbmdIaW50KCkpOworCWxheW91dC0+c2V0 TWFyZ2luKEtEaWFsb2c6Om1hcmdpbkhpbnQoKSk7CisJbGF5b3V0LT5zZXRBdXRvQWRkKHRydWUp OworCisJS1BhcnRzOjpQYXJ0OjpzZXRXaWRnZXQobV9oYm94KTsKIAogCWlmKHZpYUJyb3dzZXIp CiAJewogCQltRXh0ZW5zaW9uID0gbmV3IEthYm9vZGxlQnJvd3NlckV4dGVuc2lvbih0aGlzKTsK IAkJbUV4dGVuc2lvbi0+c2V0VVJMRHJvcEhhbmRsaW5nRW5hYmxlZCh0cnVlKTsKLQl9CiAKLQlR SEJveExheW91dCAqbGF5b3V0ID0gbmV3IFFIQm94TGF5b3V0KGJveCk7Ci0JbGF5b3V0LT5zZXRT cGFjaW5nKEtEaWFsb2c6OnNwYWNpbmdIaW50KCkpOwotCWxheW91dC0+c2V0TWFyZ2luKEtEaWFs b2c6Om1hcmdpbkhpbnQoKSk7Ci0JbGF5b3V0LT5zZXRBdXRvQWRkKHRydWUpOworCQljb25uZWN0 KHBsYXllci0+ZW5naW5lKCksIFNJR05BTCh4MTFXaW5kb3dJZChpbnQpKSwgU0xPVChlbWJlZFZp ZGVvKGludCkpKTsKKwl9CiAKIAlpZihzaG93QnV0dG9ucykKIAl7Ci0JCW1QbGF5QnV0dG9uID0g Y3JlYXRlQnV0dG9uKEJhckljb25TZXQoIjFyaWdodGFycm93IiksIGkxOG4oIlBsYXkiKSwgcGxh eWVyLCBTTE9UKHBsYXkoKSksIGJveCk7Ci0JCW1QYXVzZUJ1dHRvbiA9IGNyZWF0ZUJ1dHRvbihC YXJJY29uU2V0KCJwbGF5ZXJfcGF1c2UiKSwgaTE4bigiUGF1c2UiKSwgcGxheWVyLCBTTE9UKHBh dXNlKCkpLCBib3gpOwotCQltU3RvcEJ1dHRvbiA9IGNyZWF0ZUJ1dHRvbihCYXJJY29uU2V0KCJw bGF5ZXJfc3RvcCIpLCBpMThuKCJTdG9wIiksIHRoaXMsIFNMT1Qoc3RvcCgpKSwgYm94KTsKKwkJ bVBsYXlCdXR0b24gPSBjcmVhdGVCdXR0b24oQmFySWNvblNldCgiMXJpZ2h0YXJyb3ciKSwgaTE4 bigiUGxheSIpLCBwbGF5ZXIsIFNMT1QocGxheSgpKSwgbV9ib3gpOworCQltUGF1c2VCdXR0b24g PSBjcmVhdGVCdXR0b24oQmFySWNvblNldCgicGxheWVyX3BhdXNlIiksIGkxOG4oIlBhdXNlIiks IHBsYXllciwgU0xPVChwYXVzZSgpKSwgbV9ib3gpOworCQltU3RvcEJ1dHRvbiA9IGNyZWF0ZUJ1 dHRvbihCYXJJY29uU2V0KCJwbGF5ZXJfc3RvcCIpLCBpMThuKCJTdG9wIiksIHRoaXMsIFNMT1Qo c3RvcCgpKSwgbV9ib3gpOwogCX0KIAotCW1TZWVrZXIgPSBuZXcgTDMzdFNsaWRlcigwLCAxMDAw LCAxMCwgMCwgTDMzdFNsaWRlcjo6SG9yaXpvbnRhbCwgYm94KTsKKwltU2Vla2VyID0gbmV3IEwz M3RTbGlkZXIoMCwgMTAwMCwgMTAsIDAsIEwzM3RTbGlkZXI6Okhvcml6b250YWwsIG1fYm94KTsK IAltU2Vla2VyLT5zZXRUaWNrbWFya3MoUVNsaWRlcjo6Tm9NYXJrcyk7CiAJbVNlZWtlci0+c2hv dygpOwogCi0JbUVsYXBzZWQgPSBuZXcgUUxDRE51bWJlcig1LCBib3gpOworCW1FbGFwc2VkID0g bmV3IFFMQ0ROdW1iZXIoNSwgbV9ib3gpOwogCW1FbGFwc2VkLT5zZXRTZWdtZW50U3R5bGUoUUxD RE51bWJlcjo6RmxhdCk7CiAJbUVsYXBzZWQtPnNldEZyYW1lU3R5bGUoUUZyYW1lOjpQYW5lbCk7 CiAJbUVsYXBzZWQtPnNldEZyYW1lU2hhZG93KFFGcmFtZTo6U3Vua2VuKTsKQEAgLTEzNiw2ICsx NDMsMTMgQEAgS2Fib29kbGVQYXJ0Ojp+S2Fib29kbGVQYXJ0KCkKIAlkZWxldGUgcGxheWVyOwog fQogCit2b2lkIEthYm9vZGxlUGFydDo6ZW1iZWRWaWRlbyhpbnQgd2lkKQoreworCW1fdmlkZW9F bWJlZCA9IG5ldyBWaWRlb0VtYmVkKG1faGJveCk7CisJbV92aWRlb0VtYmVkLT5lbWJlZCh3aWQp OworCW1fdmlkZW9FbWJlZC0+c2hvdygpOworfQorCiB2b2lkIEthYm9vZGxlUGFydDo6b3BlbkZp bGUoY29uc3QgS1VSTCAmdXJsKQogewogCXBsYXllci0+b3BlbkZpbGUodXJsKTsKQEAgLTI0Nyw2 ICsyNjEsMTIgQEAgdm9pZCBLYWJvb2RsZVBhcnQ6OnNraXBUb1dyYXBwZXIoaW50IHNlYwogdm9p ZCBLYWJvb2RsZVBhcnQ6OnN0b3AoKQogewogCXBsYXllci0+c3RvcCgpOworCisJaWYobV92aWRl b0VtYmVkICE9IDApCisJeworCQlkZWxldGUgbV92aWRlb0VtYmVkOworCQltX3ZpZGVvRW1iZWQg PSAwOworCX0KIH0KIAogdm9pZCBLYWJvb2RsZVBhcnQ6Omxvb3AoKQpJbmRleDoga2Fib29kbGVf cGFydC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KUkNTIGZpbGU6IC9ob21lL2tkZS9rZGVub25iZXRhL2thYm9vZGxl L2thYm9vZGxlX3BhcnQuaCx2CnJldHJpZXZpbmcgcmV2aXNpb24gMS4xMApkaWZmIC11IC1wIC1i IC1yMS4xMCBrYWJvb2RsZV9wYXJ0LmgKLS0tIGthYm9vZGxlX3BhcnQuaAkyMDAxLzA3LzA2IDIx OjI3OjI2CTEuMTAKKysrIGthYm9vZGxlX3BhcnQuaAkyMDAxLzA3LzExIDEwOjM4OjEwCkBAIC0z MCw5ICszMCwxMSBAQCBDT05ORUNUSU9OIFdJVEggVEhFIFNPRlRXQVJFIE9SIFRIRSBVU0UgCiAj aW5jbHVkZSA8a3N0ZGFjdGlvbi5oPgogI2luY2x1ZGUgPHF3aWRnZXQuaD4KICNpbmNsdWRlIDxx aGJveC5oPgorI2luY2x1ZGUgPHFsYXlvdXQuaD4KICNpbmNsdWRlIDxxbGNkbnVtYmVyLmg+CiAj aW5jbHVkZSA8cWV2ZW50Lmg+CiAKKyNpbmNsdWRlICJ2aWRlb2VtYmVkLmgiCiAjaW5jbHVkZSAi a2Fib29kbGVfZmFjdG9yeS5oIgogI2luY2x1ZGUgImNvbnRyb2xzLmgiCiAjaW5jbHVkZSAicGxh eWVyLmgiCkBAIC03OSw2ICs4MSw4IEBAIHB1YmxpYyBzbG90czoKIAl2b2lkIHNsaWRlck1vdmVk KGludCk7CiAJdm9pZCBza2lwVG9XcmFwcGVyKGludCk7CiAKKwl2b2lkIGVtYmVkVmlkZW8oaW50 KTsKKwkKIHNpZ25hbHM6CiAJdm9pZCBza2lwVG8odW5zaWduZWQgbG9uZyk7CiAKQEAgLTk5LDYg KzEwMywxMCBAQCBwcml2YXRlOgogCUwzM3RTbGlkZXIgKm1TZWVrZXI7CiAJUUxDRE51bWJlciAq bUVsYXBzZWQ7CiAJCisJUUhCb3ggKm1faGJveDsKKwlRSEJveExheW91dCAqbV9sYXlvdXQ7CisJ UVdpZGdldCAqbV9ib3g7CisJVmlkZW9FbWJlZCAqbV92aWRlb0VtYmVkOwogCUtBY3Rpb24gKm1Q bGF5LCAqbVBhdXNlLCAqbVN0b3A7CiAJUUJ1dHRvbiAqbVBsYXlCdXR0b24sICptUGF1c2VCdXR0 b24sICptU3RvcEJ1dHRvbjsKIAlLVG9nZ2xlQWN0aW9uICptTG9vcDsKSW5kZXg6IHBsYXllci5o Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KUkNTIGZpbGU6IC9ob21lL2tkZS9rZGVub25iZXRhL2thYm9vZGxlL3BsYXll ci5oLHYKcmV0cmlldmluZyByZXZpc2lvbiAxLjgKZGlmZiAtdSAtcCAtYiAtcjEuOCBwbGF5ZXIu aAotLS0gcGxheWVyLmgJMjAwMS8wNC8yMCAwMDoyMjo0MwkxLjgKKysrIHBsYXllci5oCTIwMDEv MDcvMTEgMTA6Mzg6MTAKQEAgLTM3LDYgKzM3LDcgQEAgY2xhc3MgUGxheWVyIDogcHVibGljIFFP YmplY3QKIHsKIFFfT0JKRUNUCiAKK2ZyaWVuZCBjbGFzcyBLYWJvb2RsZVBhcnQ7CiBwdWJsaWM6 CiAJUGxheWVyKFFPYmplY3QgKnBhcmVudCA9IDApOwogCX5QbGF5ZXIoKTsKQEAgLTE1OSw2ICsx NjAsOSBAQCBzaWduYWxzOgogCiBwcml2YXRlIHNsb3RzOgogCXZvaWQgdGlja2VyVGltZW91dCgp OworCitwcm90ZWN0ZWQ6CisJRW5naW5lICplbmdpbmUoKSB7IHJldHVybiBtRW5naW5lOyB9CiAK IHByaXZhdGU6CiAJRW5naW5lICptRW5naW5lOwo= --------------Boundary-00=_391BG37JVZ2BL52S9USH Content-Type: text/x-diff; charset="iso-8859-1"; name="arts.diff" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="arts.diff" SW5kZXg6IGttZWRpYTIuaWRsCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KUkNTIGZpbGU6IC9ob21lL2tkZS9rZGVsaWJz L2FydHMvc291bmRzZXJ2ZXIva21lZGlhMi5pZGwsdgpyZXRyaWV2aW5nIHJldmlzaW9uIDEuOQpk aWZmIC11IC1wIC1iIC1yMS45IGttZWRpYTIuaWRsCi0tLSBrbWVkaWEyLmlkbAkyMDAxLzA2LzEy IDIxOjAwOjI5CTEuOQorKysga21lZGlhMi5pZGwJMjAwMS8wNy8xMSAxMDo0MDo0NQpAQCAtMTE3 LDYgKzExNywxNCBAQCBpbnRlcmZhY2UgUGxheU9iamVjdCA6IFBsYXlPYmplY3RfcHJpdmF0CiAg ICAgdm9pZCBoYWx0KCk7CiB9OwogCitpbnRlcmZhY2UgVmlkZW9QbGF5T2JqZWN0IHsKKwlhdHRy aWJ1dGUgYm9vbGVhbiBmdWxsc2NyZWVuOworCSAvKioKKwkgICogcmV0dXJucyB0aGUgWDExIFdp bmRvdyBJZAorCSAgKi8KKwlsb25nIHgxMVdpbmRvd0lkKCk7Cit9OworCiAvKioKICAqIHVzZSB0 aGlzIHRvIGNyZWF0ZSBuZXcgUGxheU9iamVjdHMgZm9yIG1lZGlhCiAgKi8K --------------Boundary-00=_391BG37JVZ2BL52S9USH-- _______________________________________________ Kde-multimedia mailing list Kde-multimedia@master.kde.org http://master.kde.org/mailman/listinfo/kde-multimedia