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 965F64359D for ; Fri, 17 Jun 2022 09:42:35 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1089268B8AD; Fri, 17 Jun 2022 12:42:34 +0300 (EEST) Received: from mail.acc.umu.se (mail.acc.umu.se [130.239.18.156]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 048FB68B581 for ; Fri, 17 Jun 2022 12:42:28 +0300 (EEST) Received: from localhost (localhost.localdomain [127.0.0.1]) by amavisd-new (Postfix) with ESMTP id 6D0AE44DEC for ; Fri, 17 Jun 2022 11:42:27 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=acc.umu.se; s=mail1; t=1655458947; bh=XX3GRIc0zreGXykCArSsy29+k+U1wGn0SF3uQ5LgSlY=; h=Subject:From:To:Date:In-Reply-To:References:From; b=kXPiiboTCPfx66xvOg070ZMLb7fyd14cdevzCQq050osun/yswvCjACnvGRN3BGsQ QB38dxM8hxD6asUKc3O+HQMEWmc6puQw8aMkbFiR7G2TP42n+/CE8W5J+I0OvSKI8s bGs0WlxsHWeX48RSGmW1C9ZdEhaEN2elfFMS/BGjbPid/NAoCf1FH5lx/18//rdK3z Yl4TocOtGd24Ra0khS0jvJW0ERnevaUZ62sx8Bd49OD9p4Z/D3b9nB+TZDJLwzES6+ fqy76aJ7LvhfGPdzM+yidTF9KJ/ieWcBrYY6FmhbrR/+Mmnh+wd2GTi2z3IB4Fg8fQ RIH2Eq+K5IGpg== Received: from debian.lan (unknown [IPv6:2a00:66c0:a::72c]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: tjoppen) by mail.acc.umu.se (Postfix) with ESMTPSA id 7BA5B44DDA for ; Fri, 17 Jun 2022 11:42:26 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=acc.umu.se; s=mail1; t=1655458946; bh=XX3GRIc0zreGXykCArSsy29+k+U1wGn0SF3uQ5LgSlY=; h=Subject:From:To:Date:In-Reply-To:References:From; b=ZQTLyznzuQGPx7hTaXyqyTcDIrySRBPuxNZxlhOkIFCfqiG5kadNXoRr2TZEqAnCy 85sps90ZsZBGoyqEOJiaY/woV637Ss341MIQo1lzeQY1qQzTXqMJK9BobESMvp/jU7 Q/hoshpzG8bII4oRdGkRww/JDH1HXvSVuwiJGU7rSNH2OGvX55I9gF0pjYnrr1KuyA FNgKCB1KZ0xCvPW5X9S1sxozxjdJV6wTbplifSA63eYYR48HD07EgU8A8IMnshOl/k 1sQNxwyficmOjGEvTwr1UwUEoSsIoXm4MPA/9WqVJpb2REL4nDR3g/pumaYmCMSkJD 9u8AE4tkXWvLg== Message-ID: <5183ed6eec9f945f54bd72907d52148d5e69d8a1.camel@acc.umu.se> From: Tomas =?ISO-8859-1?Q?H=E4rdin?= To: FFmpeg development discussions and patches Date: Fri, 17 Jun 2022 11:42:25 +0200 In-Reply-To: <20220616233807.GS396728@pb2> References: <07b64fb90f72d9bc4b5aa154b715ae121f849c71.camel@acc.umu.se> <20220616182749.GP396728@pb2> <2bfa8365a382c01dc71a01b8a9b2271356aa528b.camel@acc.umu.se> <20220616233807.GS396728@pb2> Content-Type: multipart/mixed; boundary="=-5E5pQvGGPwtFjcVNmhMZ" User-Agent: Evolution 3.38.3-1 MIME-Version: 1.0 Subject: Re: [FFmpeg-devel] [PATCH] Make execute() and execute2() return FFMIN() of thread return codes 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: , Reply-To: FFmpeg development discussions and patches Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: --=-5E5pQvGGPwtFjcVNmhMZ Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 8bit fre 2022-06-17 klockan 01:38 +0200 skrev Michael Niedermayer: > On Thu, Jun 16, 2022 at 11:04:01PM +0200, Tomas Härdin wrote: > > tor 2022-06-16 klockan 20:27 +0200 skrev Michael Niedermayer: > > > > > > >   > > > >  void avpriv_slicethread_free(AVSliceThread **pctx) > > > > @@ -236,8 +244,8 @@ void avpriv_slicethread_free(AVSliceThread > > > > **pctx) > > > >  #else /* HAVE_PTHREADS || HAVE_W32THREADS || HAVE_OS32THREADS > > > > */ > > > >   > > > >  int avpriv_slicethread_create(AVSliceThread **pctx, void > > > > *priv, > > > > -                              void (*worker_func)(void *priv, > > > > int > > > > jobnr, int threadnr, int nb_jobs, int nb_threads), > > > > -                              void (*main_func)(void *priv), > > > > +                              int (*worker_func)(void *priv, > > > > int > > > > jobnr, int threadnr, int nb_jobs, int nb_threads), > > > > +                              int (*main_func)(void *priv), > > > >                                int nb_threads) > > > >  { > > > >      *pctx = NULL; > > > > > > You forgot to update the fallback code when threads are disabled > > > > Uhm, the existing code just abort()s if threads are disabled? I'm > > not > > really sure if there anything that can or should be done there > > Before your patches fate passes with --disable-pthreads > afterwards it will fail during build because the function mismatches, > the abort should not be reachable i hope Updated patch attached /Tomas --=-5E5pQvGGPwtFjcVNmhMZ Content-Disposition: attachment; filename*0=0001-Make-execute-and-execute2-return-FFMIN-of-thread-ret.pat; filename*1=ch Content-Transfer-Encoding: base64 Content-Type: text/x-patch; name="0001-Make-execute-and-execute2-return-FFMIN-of-thread-ret.patch"; charset="UTF-8" RnJvbSBlMzcyOWY3MGQwMTZiOGU1YzlkMWJkYjYwMTQ1MDZkZGQ4ZDRlYjU2IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiA9P1VURi04P3E/VG9tYXM9MjBIPUMzPUE0cmRpbj89IDxnaXRA aGFlcmRpbi5zZT4KRGF0ZTogVGh1LCAxNiBKdW4gMjAyMiAxMjoxNjo0NCArMDIwMApTdWJqZWN0 OiBbUEFUQ0hdIE1ha2UgZXhlY3V0ZSgpIGFuZCBleGVjdXRlMigpIHJldHVybiBGRk1JTigpIG9m IHRocmVhZCByZXR1cm4KIGNvZGVzCgpBdCB0aGUgbW9tZW50IG9ubHkgZmljLmMgYWN0dWFsbHkg Y2hlY2tzIHJldHVybiBjb2RlIG9mIGV4ZWN1dGUoKSBoZW5jZSB0aGUgY2hhbmdlIHRvIGl0cyBG QVRFIHJlZmVyZW5jZQotLS0KIGxpYmF2Y29kZWMvYXZjb2RlYy5jICAgICAgICAgIHwgMTAgKysr KysrLS0tLQogbGliYXZjb2RlYy9wdGhyZWFkX3NsaWNlLmMgICAgfCAgOSArKysrKy0tLS0KIGxp YmF2ZmlsdGVyL3B0aHJlYWQuYyAgICAgICAgIHwgIDMgKystCiBsaWJhdnV0aWwvc2xpY2V0aHJl YWQuYyAgICAgICB8IDM3ICsrKysrKysrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tCiBsaWJh dnV0aWwvc2xpY2V0aHJlYWQuaCAgICAgICB8ICA2ICsrKy0tLQogbGlic3dzY2FsZS9zd3NjYWxl LmMgICAgICAgICAgfCAgNSArKystLQogbGlic3dzY2FsZS9zd3NjYWxlX2ludGVybmFsLmggfCAg NCArKy0tCiB0ZXN0cy9yZWYvZmF0ZS9maWMtYXZpICAgICAgICB8IDMwICsrKysrKysrKysrKy0t LS0tLS0tLS0tLS0tLS0KIDggZmlsZXMgY2hhbmdlZCwgNTcgaW5zZXJ0aW9ucygrKSwgNDcgZGVs ZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvbGliYXZjb2RlYy9hdmNvZGVjLmMgYi9saWJhdmNvZGVj L2F2Y29kZWMuYwppbmRleCA1ZjZlNzFhMzllLi40OWYwZmQwNmZiIDEwMDY0NAotLS0gYS9saWJh dmNvZGVjL2F2Y29kZWMuYworKysgYi9saWJhdmNvZGVjL2F2Y29kZWMuYwpAQCAtNDQsMjggKzQ0 LDMwIEBACiAKIGludCBhdmNvZGVjX2RlZmF1bHRfZXhlY3V0ZShBVkNvZGVjQ29udGV4dCAqYywg aW50ICgqZnVuYykoQVZDb2RlY0NvbnRleHQgKmMyLCB2b2lkICphcmcyKSwgdm9pZCAqYXJnLCBp bnQgKnJldCwgaW50IGNvdW50LCBpbnQgc2l6ZSkKIHsKLSAgICBpbnQgaTsKKyAgICBpbnQgaSwg cnIgPSAwOwogCiAgICAgZm9yIChpID0gMDsgaSA8IGNvdW50OyBpKyspIHsKICAgICAgICAgaW50 IHIgPSBmdW5jKGMsIChjaGFyICopYXJnICsgaSAqIHNpemUpOworICAgICAgICByciA9IEZGTUlO KHJyLCByKTsKICAgICAgICAgaWYgKHJldCkKICAgICAgICAgICAgIHJldFtpXSA9IHI7CiAgICAg fQogICAgIGVtbXNfYygpOwotICAgIHJldHVybiAwOworICAgIHJldHVybiBycjsKIH0KIAogaW50 IGF2Y29kZWNfZGVmYXVsdF9leGVjdXRlMihBVkNvZGVjQ29udGV4dCAqYywgaW50ICgqZnVuYyko QVZDb2RlY0NvbnRleHQgKmMyLCB2b2lkICphcmcyLCBpbnQgam9ibnIsIGludCB0aHJlYWRuciks IHZvaWQgKmFyZywgaW50ICpyZXQsIGludCBjb3VudCkKIHsKLSAgICBpbnQgaTsKKyAgICBpbnQg aSwgcnIgPSAwOwogCiAgICAgZm9yIChpID0gMDsgaSA8IGNvdW50OyBpKyspIHsKICAgICAgICAg aW50IHIgPSBmdW5jKGMsIGFyZywgaSwgMCk7CisgICAgICAgIHJyID0gRkZNSU4ocnIsIHIpOwog ICAgICAgICBpZiAocmV0KQogICAgICAgICAgICAgcmV0W2ldID0gcjsKICAgICB9CiAgICAgZW1t c19jKCk7Ci0gICAgcmV0dXJuIDA7CisgICAgcmV0dXJuIHJyOwogfQogCiBzdGF0aWMgQVZNdXRl eCBjb2RlY19tdXRleCA9IEFWX01VVEVYX0lOSVRJQUxJWkVSOwpkaWZmIC0tZ2l0IGEvbGliYXZj b2RlYy9wdGhyZWFkX3NsaWNlLmMgYi9saWJhdmNvZGVjL3B0aHJlYWRfc2xpY2UuYwppbmRleCAw YWQxOTY1YTIyLi41ZjAyYjliNmExIDEwMDY0NAotLS0gYS9saWJhdmNvZGVjL3B0aHJlYWRfc2xp Y2UuYworKysgYi9saWJhdmNvZGVjL3B0aHJlYWRfc2xpY2UuYwpAQCAtNTcsMTMgKzU3LDEzIEBA IHR5cGVkZWYgc3RydWN0IFNsaWNlVGhyZWFkQ29udGV4dCB7CiAgICAgcHRocmVhZF9tdXRleF90 ICpwcm9ncmVzc19tdXRleDsKIH0gU2xpY2VUaHJlYWRDb250ZXh0OwogCi1zdGF0aWMgdm9pZCBt YWluX2Z1bmN0aW9uKHZvaWQgKnByaXYpIHsKK3N0YXRpYyBpbnQgbWFpbl9mdW5jdGlvbih2b2lk ICpwcml2KSB7CiAgICAgQVZDb2RlY0NvbnRleHQgKmF2Y3R4ID0gcHJpdjsKICAgICBTbGljZVRo cmVhZENvbnRleHQgKmMgPSBhdmN0eC0+aW50ZXJuYWwtPnRocmVhZF9jdHg7Ci0gICAgYy0+bWFp bmZ1bmMoYXZjdHgpOworICAgIHJldHVybiBjLT5tYWluZnVuYyhhdmN0eCk7CiB9CiAKLXN0YXRp YyB2b2lkIHdvcmtlcl9mdW5jKHZvaWQgKnByaXYsIGludCBqb2JuciwgaW50IHRocmVhZG5yLCBp bnQgbmJfam9icywgaW50IG5iX3RocmVhZHMpCitzdGF0aWMgaW50IHdvcmtlcl9mdW5jKHZvaWQg KnByaXYsIGludCBqb2JuciwgaW50IHRocmVhZG5yLCBpbnQgbmJfam9icywgaW50IG5iX3RocmVh ZHMpCiB7CiAgICAgQVZDb2RlY0NvbnRleHQgKmF2Y3R4ID0gcHJpdjsKICAgICBTbGljZVRocmVh ZENvbnRleHQgKmMgPSBhdmN0eC0+aW50ZXJuYWwtPnRocmVhZF9jdHg7CkBAIC03Myw2ICs3Myw3 IEBAIHN0YXRpYyB2b2lkIHdvcmtlcl9mdW5jKHZvaWQgKnByaXYsIGludCBqb2JuciwgaW50IHRo cmVhZG5yLCBpbnQgbmJfam9icywgaW50IG5iCiAgICAgICAgICAgICAgICAgICA6IGMtPmZ1bmMy KGF2Y3R4LCBjLT5hcmdzLCBqb2JuciwgdGhyZWFkbnIpOwogICAgIGlmIChjLT5yZXRzKQogICAg ICAgICBjLT5yZXRzW2pvYm5yXSA9IHJldDsKKyAgICByZXR1cm4gcmV0OwogfQogCiB2b2lkIGZm X3NsaWNlX3RocmVhZF9mcmVlKEFWQ29kZWNDb250ZXh0ICphdmN0eCkKQEAgLTEzMSw3ICsxMzIs NyBAQCBpbnQgZmZfc2xpY2VfdGhyZWFkX2luaXQoQVZDb2RlY0NvbnRleHQgKmF2Y3R4KQogewog ICAgIFNsaWNlVGhyZWFkQ29udGV4dCAqYzsKICAgICBpbnQgdGhyZWFkX2NvdW50ID0gYXZjdHgt PnRocmVhZF9jb3VudDsKLSAgICB2b2lkICgqbWFpbmZ1bmMpKHZvaWQgKik7CisgICAgaW50ICgq bWFpbmZ1bmMpKHZvaWQgKik7CiAKICAgICAvLyBXZSBjYW5ub3QgZG8gdGhpcyBpbiB0aGUgZW5j b2RlciBpbml0IGFzIHRoZSB0aHJlYWRzIGFyZSBjcmVhdGVkIGJlZm9yZQogICAgIGlmIChhdl9j b2RlY19pc19lbmNvZGVyKGF2Y3R4LT5jb2RlYykgJiYKZGlmZiAtLWdpdCBhL2xpYmF2ZmlsdGVy L3B0aHJlYWQuYyBiL2xpYmF2ZmlsdGVyL3B0aHJlYWQuYwppbmRleCAxYTA2M2QzY2MwLi44Y2Vj Mjc4YmUwIDEwMDY0NAotLS0gYS9saWJhdmZpbHRlci9wdGhyZWFkLmMKKysrIGIvbGliYXZmaWx0 ZXIvcHRocmVhZC5jCkBAIC00MywxMiArNDMsMTMgQEAgdHlwZWRlZiBzdHJ1Y3QgVGhyZWFkQ29u dGV4dCB7CiAgICAgaW50ICAgKnJldHM7CiB9IFRocmVhZENvbnRleHQ7CiAKLXN0YXRpYyB2b2lk IHdvcmtlcl9mdW5jKHZvaWQgKnByaXYsIGludCBqb2JuciwgaW50IHRocmVhZG5yLCBpbnQgbmJf am9icywgaW50IG5iX3RocmVhZHMpCitzdGF0aWMgaW50IHdvcmtlcl9mdW5jKHZvaWQgKnByaXYs IGludCBqb2JuciwgaW50IHRocmVhZG5yLCBpbnQgbmJfam9icywgaW50IG5iX3RocmVhZHMpCiB7 CiAgICAgVGhyZWFkQ29udGV4dCAqYyA9IHByaXY7CiAgICAgaW50IHJldCA9IGMtPmZ1bmMoYy0+ Y3R4LCBjLT5hcmcsIGpvYm5yLCBuYl9qb2JzKTsKICAgICBpZiAoYy0+cmV0cykKICAgICAgICAg Yy0+cmV0c1tqb2Jucl0gPSByZXQ7CisgICAgcmV0dXJuIHJldDsKIH0KIAogc3RhdGljIHZvaWQg c2xpY2VfdGhyZWFkX3VuaW5pdChUaHJlYWRDb250ZXh0ICpjKQpkaWZmIC0tZ2l0IGEvbGliYXZ1 dGlsL3NsaWNldGhyZWFkLmMgYi9saWJhdnV0aWwvc2xpY2V0aHJlYWQuYwppbmRleCBlYTFjOWM4 MzExLi4yZTc4ZDMyYWI4IDEwMDY0NAotLS0gYS9saWJhdnV0aWwvc2xpY2V0aHJlYWQuYworKysg Yi9saWJhdnV0aWwvc2xpY2V0aHJlYWQuYwpAQCAtMzIsNiArMzIsNyBAQCB0eXBlZGVmIHN0cnVj dCBXb3JrZXJDb250ZXh0IHsKICAgICBwdGhyZWFkX2NvbmRfdCAgY29uZDsKICAgICBwdGhyZWFk X3QgICAgICAgdGhyZWFkOwogICAgIGludCAgICAgICAgICAgICBkb25lOworICAgIGludCAgICAg ICAgICAgICByZXQ7CiB9IFdvcmtlckNvbnRleHQ7CiAKIHN0cnVjdCBBVlNsaWNlVGhyZWFkIHsK QEAgLTQ4LDExICs0OSwxMSBAQCBzdHJ1Y3QgQVZTbGljZVRocmVhZCB7CiAgICAgaW50ICAgICAg ICAgICAgIGZpbmlzaGVkOwogCiAgICAgdm9pZCAgICAgICAgICAgICpwcml2OwotICAgIHZvaWQg ICAgICAgICAgICAoKndvcmtlcl9mdW5jKSh2b2lkICpwcml2LCBpbnQgam9ibnIsIGludCB0aHJl YWRuciwgaW50IG5iX2pvYnMsIGludCBuYl90aHJlYWRzKTsKLSAgICB2b2lkICAgICAgICAgICAg KCptYWluX2Z1bmMpKHZvaWQgKnByaXYpOworICAgIGludCAgICAgICAgICAgICAoKndvcmtlcl9m dW5jKSh2b2lkICpwcml2LCBpbnQgam9ibnIsIGludCB0aHJlYWRuciwgaW50IG5iX2pvYnMsIGlu dCBuYl90aHJlYWRzKTsKKyAgICBpbnQgICAgICAgICAgICAgKCptYWluX2Z1bmMpKHZvaWQgKnBy aXYpOwogfTsKIAotc3RhdGljIGludCBydW5fam9icyhBVlNsaWNlVGhyZWFkICpjdHgpCitzdGF0 aWMgaW50IHJ1bl9qb2JzKEFWU2xpY2VUaHJlYWQgKmN0eCwgaW50ICpyZXRfb3V0KQogewogICAg IHVuc2lnbmVkIG5iX2pvYnMgICAgPSBjdHgtPm5iX2pvYnM7CiAgICAgdW5zaWduZWQgbmJfYWN0 aXZlX3RocmVhZHMgPSBjdHgtPm5iX2FjdGl2ZV90aHJlYWRzOwpAQCAtNjAsNyArNjEsOCBAQCBz dGF0aWMgaW50IHJ1bl9qb2JzKEFWU2xpY2VUaHJlYWQgKmN0eCkKICAgICB1bnNpZ25lZCBjdXJy ZW50X2pvYiAgPSBmaXJzdF9qb2I7CiAKICAgICBkbyB7Ci0gICAgICAgIGN0eC0+d29ya2VyX2Z1 bmMoY3R4LT5wcml2LCBjdXJyZW50X2pvYiwgZmlyc3Rfam9iLCBuYl9qb2JzLCBuYl9hY3RpdmVf dGhyZWFkcyk7CisgICAgICAgIGludCByZXQgPSBjdHgtPndvcmtlcl9mdW5jKGN0eC0+cHJpdiwg Y3VycmVudF9qb2IsIGZpcnN0X2pvYiwgbmJfam9icywgbmJfYWN0aXZlX3RocmVhZHMpOworICAg ICAgICAqcmV0X291dCA9IEZGTUlOKCpyZXRfb3V0LCByZXQpOwogICAgIH0gd2hpbGUgKChjdXJy ZW50X2pvYiA9IGF0b21pY19mZXRjaF9hZGRfZXhwbGljaXQoJmN0eC0+Y3VycmVudF9qb2IsIDEs IG1lbW9yeV9vcmRlcl9hY3FfcmVsKSkgPCBuYl9qb2JzKTsKIAogICAgIHJldHVybiBjdXJyZW50 X2pvYiA9PSBuYl9qb2JzICsgbmJfYWN0aXZlX3RocmVhZHMgLSAxOwpAQCAtODQsNyArODYsNyBA QCBzdGF0aWMgdm9pZCAqYXR0cmlidXRlX2FsaWduX2FyZyB0aHJlYWRfd29ya2VyKHZvaWQgKnYp CiAgICAgICAgICAgICByZXR1cm4gTlVMTDsKICAgICAgICAgfQogCi0gICAgICAgIGlmIChydW5f am9icyhjdHgpKSB7CisgICAgICAgIGlmIChydW5fam9icyhjdHgsICZ3LT5yZXQpKSB7CiAgICAg ICAgICAgICBwdGhyZWFkX211dGV4X2xvY2soJmN0eC0+ZG9uZV9tdXRleCk7CiAgICAgICAgICAg ICBjdHgtPmRvbmUgPSAxOwogICAgICAgICAgICAgcHRocmVhZF9jb25kX3NpZ25hbCgmY3R4LT5k b25lX2NvbmQpOwpAQCAtOTQsOCArOTYsOCBAQCBzdGF0aWMgdm9pZCAqYXR0cmlidXRlX2FsaWdu X2FyZyB0aHJlYWRfd29ya2VyKHZvaWQgKnYpCiB9CiAKIGludCBhdnByaXZfc2xpY2V0aHJlYWRf Y3JlYXRlKEFWU2xpY2VUaHJlYWQgKipwY3R4LCB2b2lkICpwcml2LAotICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgdm9pZCAoKndvcmtlcl9mdW5jKSh2b2lkICpwcml2LCBpbnQgam9ibnIs IGludCB0aHJlYWRuciwgaW50IG5iX2pvYnMsIGludCBuYl90aHJlYWRzKSwKLSAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIHZvaWQgKCptYWluX2Z1bmMpKHZvaWQgKnByaXYpLAorICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgaW50ICgqd29ya2VyX2Z1bmMpKHZvaWQgKnByaXYsIGlu dCBqb2JuciwgaW50IHRocmVhZG5yLCBpbnQgbmJfam9icywgaW50IG5iX3RocmVhZHMpLAorICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgaW50ICgqbWFpbl9mdW5jKSh2b2lkICpwcml2KSwK ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGludCBuYl90aHJlYWRzKQogewogICAgIEFW U2xpY2VUaHJlYWQgKmN0eDsKQEAgLTE2Myw5ICsxNjUsOSBAQCBpbnQgYXZwcml2X3NsaWNldGhy ZWFkX2NyZWF0ZShBVlNsaWNlVGhyZWFkICoqcGN0eCwgdm9pZCAqcHJpdiwKICAgICByZXR1cm4g bmJfdGhyZWFkczsKIH0KIAotdm9pZCBhdnByaXZfc2xpY2V0aHJlYWRfZXhlY3V0ZShBVlNsaWNl VGhyZWFkICpjdHgsIGludCBuYl9qb2JzLCBpbnQgZXhlY3V0ZV9tYWluKQoraW50IGF2cHJpdl9z bGljZXRocmVhZF9leGVjdXRlKEFWU2xpY2VUaHJlYWQgKmN0eCwgaW50IG5iX2pvYnMsIGludCBl eGVjdXRlX21haW4pCiB7Ci0gICAgaW50IG5iX3dvcmtlcnMsIGksIGlzX2xhc3QgPSAwOworICAg IGludCBuYl93b3JrZXJzLCBpLCBpc19sYXN0ID0gMCwgcmV0ID0gMDsKIAogICAgIGF2X2Fzc2Vy dDAobmJfam9icyA+IDApOwogICAgIGN0eC0+bmJfam9icyAgICAgICAgICAgPSBuYl9qb2JzOwpA QCAtMTgwLDE0ICsxODIsMTUgQEAgdm9pZCBhdnByaXZfc2xpY2V0aHJlYWRfZXhlY3V0ZShBVlNs aWNlVGhyZWFkICpjdHgsIGludCBuYl9qb2JzLCBpbnQgZXhlY3V0ZV9tYWkKICAgICAgICAgV29y a2VyQ29udGV4dCAqdyA9ICZjdHgtPndvcmtlcnNbaV07CiAgICAgICAgIHB0aHJlYWRfbXV0ZXhf bG9jaygmdy0+bXV0ZXgpOwogICAgICAgICB3LT5kb25lID0gMDsKKyAgICAgICAgdy0+cmV0ID0g MDsKICAgICAgICAgcHRocmVhZF9jb25kX3NpZ25hbCgmdy0+Y29uZCk7CiAgICAgICAgIHB0aHJl YWRfbXV0ZXhfdW5sb2NrKCZ3LT5tdXRleCk7CiAgICAgfQogCiAgICAgaWYgKGN0eC0+bWFpbl9m dW5jICYmIGV4ZWN1dGVfbWFpbikKLSAgICAgICAgY3R4LT5tYWluX2Z1bmMoY3R4LT5wcml2KTsK KyAgICAgICAgcmV0ID0gY3R4LT5tYWluX2Z1bmMoY3R4LT5wcml2KTsKICAgICBlbHNlCi0gICAg ICAgIGlzX2xhc3QgPSBydW5fam9icyhjdHgpOworICAgICAgICBpc19sYXN0ID0gcnVuX2pvYnMo Y3R4LCAmcmV0KTsKIAogICAgIGlmICghaXNfbGFzdCkgewogICAgICAgICBwdGhyZWFkX211dGV4 X2xvY2soJmN0eC0+ZG9uZV9tdXRleCk7CkBAIC0xOTYsNiArMTk5LDExIEBAIHZvaWQgYXZwcml2 X3NsaWNldGhyZWFkX2V4ZWN1dGUoQVZTbGljZVRocmVhZCAqY3R4LCBpbnQgbmJfam9icywgaW50 IGV4ZWN1dGVfbWFpCiAgICAgICAgIGN0eC0+ZG9uZSA9IDA7CiAgICAgICAgIHB0aHJlYWRfbXV0 ZXhfdW5sb2NrKCZjdHgtPmRvbmVfbXV0ZXgpOwogICAgIH0KKworICAgIGZvciAoaSA9IDA7IGkg PCBuYl93b3JrZXJzOyBpKyspCisgICAgICAgIHJldCA9IEZGTUlOKHJldCwgY3R4LT53b3JrZXJz W2ldLnJldCk7CisKKyAgICByZXR1cm4gcmV0OwogfQogCiB2b2lkIGF2cHJpdl9zbGljZXRocmVh ZF9mcmVlKEFWU2xpY2VUaHJlYWQgKipwY3R4KQpAQCAtMjM2LDE3ICsyNDQsMTggQEAgdm9pZCBh dnByaXZfc2xpY2V0aHJlYWRfZnJlZShBVlNsaWNlVGhyZWFkICoqcGN0eCkKICNlbHNlIC8qIEhB VkVfUFRIUkVBRFMgfHwgSEFWRV9XMzJUSFJFQURTIHx8IEhBVkVfT1MzMlRIUkVBRFMgKi8KIAog aW50IGF2cHJpdl9zbGljZXRocmVhZF9jcmVhdGUoQVZTbGljZVRocmVhZCAqKnBjdHgsIHZvaWQg KnByaXYsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICB2b2lkICgqd29ya2VyX2Z1bmMp KHZvaWQgKnByaXYsIGludCBqb2JuciwgaW50IHRocmVhZG5yLCBpbnQgbmJfam9icywgaW50IG5i X3RocmVhZHMpLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgdm9pZCAoKm1haW5fZnVu Yykodm9pZCAqcHJpdiksCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBpbnQgKCp3b3Jr ZXJfZnVuYykodm9pZCAqcHJpdiwgaW50IGpvYm5yLCBpbnQgdGhyZWFkbnIsIGludCBuYl9qb2Jz LCBpbnQgbmJfdGhyZWFkcyksCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBpbnQgKCpt YWluX2Z1bmMpKHZvaWQgKnByaXYpLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgaW50 IG5iX3RocmVhZHMpCiB7CiAgICAgKnBjdHggPSBOVUxMOwogICAgIHJldHVybiBBVkVSUk9SKEVO T1NZUyk7CiB9CiAKLXZvaWQgYXZwcml2X3NsaWNldGhyZWFkX2V4ZWN1dGUoQVZTbGljZVRocmVh ZCAqY3R4LCBpbnQgbmJfam9icywgaW50IGV4ZWN1dGVfbWFpbikKK2ludCBhdnByaXZfc2xpY2V0 aHJlYWRfZXhlY3V0ZShBVlNsaWNlVGhyZWFkICpjdHgsIGludCBuYl9qb2JzLCBpbnQgZXhlY3V0 ZV9tYWluKQogewogICAgIGF2X2Fzc2VydDAoMCk7CisgICAgcmV0dXJuIEFWRVJST1IoRU5PU1lT KTsKIH0KIAogdm9pZCBhdnByaXZfc2xpY2V0aHJlYWRfZnJlZShBVlNsaWNlVGhyZWFkICoqcGN0 eCkKZGlmZiAtLWdpdCBhL2xpYmF2dXRpbC9zbGljZXRocmVhZC5oIGIvbGliYXZ1dGlsL3NsaWNl dGhyZWFkLmgKaW5kZXggZjZmNmYzMDJjNC4uNWM4ZjE5NzkzMiAxMDA2NDQKLS0tIGEvbGliYXZ1 dGlsL3NsaWNldGhyZWFkLmgKKysrIGIvbGliYXZ1dGlsL3NsaWNldGhyZWFkLmgKQEAgLTMxLDgg KzMxLDggQEAgdHlwZWRlZiBzdHJ1Y3QgQVZTbGljZVRocmVhZCBBVlNsaWNlVGhyZWFkOwogICog QHJldHVybiByZXR1cm4gbnVtYmVyIG9mIHRocmVhZHMgb3IgbmVnYXRpdmUgQVZFUlJPUiBvbiBm YWlsdXJlCiAgKi8KIGludCBhdnByaXZfc2xpY2V0aHJlYWRfY3JlYXRlKEFWU2xpY2VUaHJlYWQg KipwY3R4LCB2b2lkICpwcml2LAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgdm9pZCAo Kndvcmtlcl9mdW5jKSh2b2lkICpwcml2LCBpbnQgam9ibnIsIGludCB0aHJlYWRuciwgaW50IG5i X2pvYnMsIGludCBuYl90aHJlYWRzKSwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHZv aWQgKCptYWluX2Z1bmMpKHZvaWQgKnByaXYpLAorICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgaW50ICgqd29ya2VyX2Z1bmMpKHZvaWQgKnByaXYsIGludCBqb2JuciwgaW50IHRocmVhZG5y LCBpbnQgbmJfam9icywgaW50IG5iX3RocmVhZHMpLAorICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgaW50ICgqbWFpbl9mdW5jKSh2b2lkICpwcml2KSwKICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIGludCBuYl90aHJlYWRzKTsKIAogLyoqCkBAIC00MSw3ICs0MSw3IEBAIGludCBh dnByaXZfc2xpY2V0aHJlYWRfY3JlYXRlKEFWU2xpY2VUaHJlYWQgKipwY3R4LCB2b2lkICpwcml2 LAogICogQHBhcmFtIG5iX2pvYnMgbnVtYmVyIG9mIGpvYnMsIG11c3QgYmUgPiAwCiAgKiBAcGFy YW0gZXhlY3V0ZV9tYWluIGFsc28gZXhlY3V0ZSBtYWluX2Z1bmMKICAqLwotdm9pZCBhdnByaXZf c2xpY2V0aHJlYWRfZXhlY3V0ZShBVlNsaWNlVGhyZWFkICpjdHgsIGludCBuYl9qb2JzLCBpbnQg ZXhlY3V0ZV9tYWluKTsKK2ludCBhdnByaXZfc2xpY2V0aHJlYWRfZXhlY3V0ZShBVlNsaWNlVGhy ZWFkICpjdHgsIGludCBuYl9qb2JzLCBpbnQgZXhlY3V0ZV9tYWluKTsKIAogLyoqCiAgKiBEZXN0 cm95IHNsaWNlIHRocmVhZGluZyBjb250ZXh0LgpkaWZmIC0tZ2l0IGEvbGlic3dzY2FsZS9zd3Nj YWxlLmMgYi9saWJzd3NjYWxlL3N3c2NhbGUuYwppbmRleCA3YjQwZjQ5ZGE0Li4yZjlhMGI1YTdj IDEwMDY0NAotLS0gYS9saWJzd3NjYWxlL3N3c2NhbGUuYworKysgYi9saWJzd3NjYWxlL3N3c2Nh bGUuYwpAQCAtMTIxMSw4ICsxMjExLDggQEAgaW50IGF0dHJpYnV0ZV9hbGlnbl9hcmcgc3dzX3Nj YWxlKHN0cnVjdCBTd3NDb250ZXh0ICpjLAogICAgICAgICAgICAgICAgICAgICAgICAgICBkc3Qs IGRzdFN0cmlkZSwgMCwgYy0+ZHN0SCk7CiB9CiAKLXZvaWQgZmZfc3dzX3NsaWNlX3dvcmtlcih2 b2lkICpwcml2LCBpbnQgam9ibnIsIGludCB0aHJlYWRuciwKLSAgICAgICAgICAgICAgICAgICAg ICAgICBpbnQgbmJfam9icywgaW50IG5iX3RocmVhZHMpCitpbnQgZmZfc3dzX3NsaWNlX3dvcmtl cih2b2lkICpwcml2LCBpbnQgam9ibnIsIGludCB0aHJlYWRuciwKKyAgICAgICAgICAgICAgICAg ICAgICAgIGludCBuYl9qb2JzLCBpbnQgbmJfdGhyZWFkcykKIHsKICAgICBTd3NDb250ZXh0ICpw YXJlbnQgPSBwcml2OwogICAgIFN3c0NvbnRleHQgICAgICAqYyA9IHBhcmVudC0+c2xpY2VfY3R4 W3RocmVhZG5yXTsKQEAgLTEyNDEsNCArMTI0MSw1IEBAIHZvaWQgZmZfc3dzX3NsaWNlX3dvcmtl cih2b2lkICpwcml2LCBpbnQgam9ibnIsIGludCB0aHJlYWRuciwKICAgICB9CiAKICAgICBwYXJl bnQtPnNsaWNlX2Vyclt0aHJlYWRucl0gPSBlcnI7CisgICAgcmV0dXJuIGVycjsKIH0KZGlmZiAt LWdpdCBhL2xpYnN3c2NhbGUvc3dzY2FsZV9pbnRlcm5hbC5oIGIvbGlic3dzY2FsZS9zd3NjYWxl X2ludGVybmFsLmgKaW5kZXggZTExOGI1NDQ1Ny4uZWFiM2UyNjMzMSAxMDA2NDQKLS0tIGEvbGli c3dzY2FsZS9zd3NjYWxlX2ludGVybmFsLmgKKysrIGIvbGlic3dzY2FsZS9zd3NjYWxlX2ludGVy bmFsLmgKQEAgLTExMzUsOCArMTEzNSw4IEBAIHZvaWQgZmZfaW5pdF92c2NhbGVfcGZuKFN3c0Nv bnRleHQgKmMsIHl1djJwbGFuYXIxX2ZuIHl1djJwbGFuZTEsIHl1djJwbGFuYXJYX2ZuCiAgICAg eXV2MmludGVybGVhdmVkWF9mbiB5dXYybnYxMmNYLCB5dXYycGFja2VkMV9mbiB5dXYycGFja2Vk MSwgeXV2MnBhY2tlZDJfZm4geXV2MnBhY2tlZDIsCiAgICAgeXV2MnBhY2tlZFhfZm4geXV2MnBh Y2tlZFgsIHl1djJhbnlYX2ZuIHl1djJhbnlYLCBpbnQgdXNlX21teCk7CiAKLXZvaWQgZmZfc3dz X3NsaWNlX3dvcmtlcih2b2lkICpwcml2LCBpbnQgam9ibnIsIGludCB0aHJlYWRuciwKLSAgICAg ICAgICAgICAgICAgICAgICAgICBpbnQgbmJfam9icywgaW50IG5iX3RocmVhZHMpOworaW50IGZm X3N3c19zbGljZV93b3JrZXIodm9pZCAqcHJpdiwgaW50IGpvYm5yLCBpbnQgdGhyZWFkbnIsCisg ICAgICAgICAgICAgICAgICAgICAgICBpbnQgbmJfam9icywgaW50IG5iX3RocmVhZHMpOwogCiAv L251bWJlciBvZiBleHRyYSBsaW5lcyB0byBwcm9jZXNzCiAjZGVmaW5lIE1BWF9MSU5FU19BSEVB RCA0CmRpZmYgLS1naXQgYS90ZXN0cy9yZWYvZmF0ZS9maWMtYXZpIGIvdGVzdHMvcmVmL2ZhdGUv ZmljLWF2aQppbmRleCBkZjU1Nzg5ZDU0Li40NTQ2ZjIzMGIxIDEwMDY0NAotLS0gYS90ZXN0cy9y ZWYvZmF0ZS9maWMtYXZpCisrKyBiL3Rlc3RzL3JlZi9mYXRlL2ZpYy1hdmkKQEAgLTc2LDE5ICs3 NiwxOCBAQAogMCwgICAgICAgICA3MCwgICAgICAgICA3MCwgICAgICAgIDEsICAxNTY2NzIwLCAw eDQwZjdkMzlhCiAwLCAgICAgICAgIDcxLCAgICAgICAgIDcxLCAgICAgICAgMSwgIDE1NjY3MjAs IDB4NDBmN2QzOWEKIDAsICAgICAgICAgNzIsICAgICAgICAgNzIsICAgICAgICAxLCAgMTU2Njcy MCwgMHg0MGY3ZDM5YQotMCwgICAgICAgICA3MywgICAgICAgICA3MywgICAgICAgIDEsICAxNTY2 NzIwLCAweGE3ZDZlMjVmCi0wLCAgICAgICAgIDc0LCAgICAgICAgIDc0LCAgICAgICAgMSwgIDE1 NjY3MjAsIDB4YTdkNmUyNWYKLTAsICAgICAgICAgNzUsICAgICAgICAgNzUsICAgICAgICAxLCAg MTU2NjcyMCwgMHhhN2Q2ZTI1ZgotMCwgICAgICAgICA3NiwgICAgICAgICA3NiwgICAgICAgIDEs ICAxNTY2NzIwLCAweGE3ZDZlMjVmCi0wLCAgICAgICAgIDc3LCAgICAgICAgIDc3LCAgICAgICAg MSwgIDE1NjY3MjAsIDB4YTdkNmUyNWYKLTAsICAgICAgICAgNzgsICAgICAgICAgNzgsICAgICAg ICAxLCAgMTU2NjcyMCwgMHhhN2Q2ZTI1ZgotMCwgICAgICAgICA3OSwgICAgICAgICA3OSwgICAg ICAgIDEsICAxNTY2NzIwLCAweGE3ZDZlMjVmCi0wLCAgICAgICAgIDgwLCAgICAgICAgIDgwLCAg ICAgICAgMSwgIDE1NjY3MjAsIDB4YTdkNmUyNWYKLTAsICAgICAgICAgODEsICAgICAgICAgODEs ICAgICAgICAxLCAgMTU2NjcyMCwgMHhhN2Q2ZTI1ZgotMCwgICAgICAgICA4MiwgICAgICAgICA4 MiwgICAgICAgIDEsICAxNTY2NzIwLCAweGE3ZDZlMjVmCi0wLCAgICAgICAgIDgzLCAgICAgICAg IDgzLCAgICAgICAgMSwgIDE1NjY3MjAsIDB4YTdkNmUyNWYKLTAsICAgICAgICAgODQsICAgICAg ICAgODQsICAgICAgICAxLCAgMTU2NjcyMCwgMHhhN2Q2ZTI1ZgotMCwgICAgICAgICA4NSwgICAg ICAgICA4NSwgICAgICAgIDEsICAxNTY2NzIwLCAweGE3ZDZlMjVmCiswLCAgICAgICAgIDc0LCAg ICAgICAgIDc0LCAgICAgICAgMSwgIDE1NjY3MjAsIDB4NDBmN2QzOWEKKzAsICAgICAgICAgNzUs ICAgICAgICAgNzUsICAgICAgICAxLCAgMTU2NjcyMCwgMHg0MGY3ZDM5YQorMCwgICAgICAgICA3 NiwgICAgICAgICA3NiwgICAgICAgIDEsICAxNTY2NzIwLCAweDQwZjdkMzlhCiswLCAgICAgICAg IDc3LCAgICAgICAgIDc3LCAgICAgICAgMSwgIDE1NjY3MjAsIDB4NDBmN2QzOWEKKzAsICAgICAg ICAgNzgsICAgICAgICAgNzgsICAgICAgICAxLCAgMTU2NjcyMCwgMHg0MGY3ZDM5YQorMCwgICAg ICAgICA3OSwgICAgICAgICA3OSwgICAgICAgIDEsICAxNTY2NzIwLCAweDQwZjdkMzlhCiswLCAg ICAgICAgIDgwLCAgICAgICAgIDgwLCAgICAgICAgMSwgIDE1NjY3MjAsIDB4NDBmN2QzOWEKKzAs ICAgICAgICAgODEsICAgICAgICAgODEsICAgICAgICAxLCAgMTU2NjcyMCwgMHg0MGY3ZDM5YQor MCwgICAgICAgICA4MiwgICAgICAgICA4MiwgICAgICAgIDEsICAxNTY2NzIwLCAweDQwZjdkMzlh CiswLCAgICAgICAgIDgzLCAgICAgICAgIDgzLCAgICAgICAgMSwgIDE1NjY3MjAsIDB4NDBmN2Qz OWEKKzAsICAgICAgICAgODQsICAgICAgICAgODQsICAgICAgICAxLCAgMTU2NjcyMCwgMHg0MGY3 ZDM5YQorMCwgICAgICAgICA4NSwgICAgICAgICA4NSwgICAgICAgIDEsICAxNTY2NzIwLCAweDQw ZjdkMzlhCiAwLCAgICAgICAgIDg2LCAgICAgICAgIDg2LCAgICAgICAgMSwgIDE1NjY3MjAsIDB4 YTdkNmUyNWYKIDAsICAgICAgICAgODcsICAgICAgICAgODcsICAgICAgICAxLCAgMTU2NjcyMCwg MHhhN2Q2ZTI1ZgogMCwgICAgICAgICA4OCwgICAgICAgICA4OCwgICAgICAgIDEsICAxNTY2NzIw LCAweGE3ZDZlMjVmCkBAIC0xMDQsNyArMTAzLDYgQEAKIDAsICAgICAgICAgOTgsICAgICAgICAg OTgsICAgICAgICAxLCAgMTU2NjcyMCwgMHhhN2Q2ZTI1ZgogMCwgICAgICAgICA5OSwgICAgICAg ICA5OSwgICAgICAgIDEsICAxNTY2NzIwLCAweGE3ZDZlMjVmCiAwLCAgICAgICAgMTAwLCAgICAg ICAgMTAwLCAgICAgICAgMSwgIDE1NjY3MjAsIDB4ZWFmOGQyMDcKLTAsICAgICAgICAxMDEsICAg ICAgICAxMDEsICAgICAgICAxLCAgMTU2NjcyMCwgMHg2NzI0OTgzZQogMCwgICAgICAgIDEwMiwg ICAgICAgIDEwMiwgICAgICAgIDEsICAxNTY2NzIwLCAweDBlOTVkMjA5CiAwLCAgICAgICAgMTAz LCAgICAgICAgMTAzLCAgICAgICAgMSwgIDE1NjY3MjAsIDB4MGU5NWQyMDkKIDAsICAgICAgICAx MDQsICAgICAgICAxMDQsICAgICAgICAxLCAgMTU2NjcyMCwgMHgwZTk1ZDIwOQpAQCAtMTIxLDYg KzExOSw0IEBACiAwLCAgICAgICAgMTE1LCAgICAgICAgMTE1LCAgICAgICAgMSwgIDE1NjY3MjAs IDB4ZmU4M2I5NjQKIDAsICAgICAgICAxMTYsICAgICAgICAxMTYsICAgICAgICAxLCAgMTU2Njcy MCwgMHhmZTgzYjk2NAogMCwgICAgICAgIDExNywgICAgICAgIDExNywgICAgICAgIDEsICAxNTY2 NzIwLCAweGZlODNiOTY0Ci0wLCAgICAgICAgMTE4LCAgICAgICAgMTE4LCAgICAgICAgMSwgIDE1 NjY3MjAsIDB4MjVkYzMwYTYKLTAsICAgICAgICAxMTksICAgICAgICAxMTksICAgICAgICAxLCAg MTU2NjcyMCwgMHgyNWRjMzBhNgotMCwgICAgICAgIDEyMCwgICAgICAgIDEyMCwgICAgICAgIDEs ICAxNTY2NzIwLCAweDI1ZGMzMGE2CiswLCAgICAgICAgMTE5LCAgICAgICAgMTE5LCAgICAgICAg MSwgIDE1NjY3MjAsIDB4ZmU4M2I5NjQKLS0gCjIuMzAuMgoK --=-5E5pQvGGPwtFjcVNmhMZ 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". --=-5E5pQvGGPwtFjcVNmhMZ--