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 89B0043F81 for ; Tue, 23 Aug 2022 09:53:36 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1DF0768B8A4; Tue, 23 Aug 2022 12:53:33 +0300 (EEST) Received: from mail-yw1-f174.google.com (mail-yw1-f174.google.com [209.85.128.174]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 27BBC68B7C9 for ; Tue, 23 Aug 2022 12:53:27 +0300 (EEST) Received: by mail-yw1-f174.google.com with SMTP id 00721157ae682-3375488624aso335827457b3.3 for ; Tue, 23 Aug 2022 02:53:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=to:subject:message-id:date:from:mime-version:from:to:cc; bh=VukaGaB4U56jdO1Md7DlXhLXt3BegEwyNx/IpGmQ9h0=; b=nmjYLXXUZsnZbLlI1heVjqvwG66W7nNM/ioDOn/ytbFCdGOWx2x/Ain7vpszjrSLSY UQjaXc4xq+R/eOn7ypDxmSVZNNR2rZ7NgZlug+y7PMfXS48lwlFAnJYWIA3+67MT2B4t /9ruZ43YmXW18HhSkl/jd03oT9prHcb/VhT2WQLCKYvi9gicnm4Re17LWwCmY/Zrs3Ox Y5jLVr6IaHJ5CLDYYLWnLCpxF8zPLP9ScrbQEgufoWZmsiCYyd1T1noOAYQoKAzOM1Jb iGcDlKS73is+W5c423L6YLAQFKVYn651ASxRXwi+JFBzdHnwuHd9cz1ygXODMA++igMZ KSag== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=to:subject:message-id:date:from:mime-version:x-gm-message-state :from:to:cc; bh=VukaGaB4U56jdO1Md7DlXhLXt3BegEwyNx/IpGmQ9h0=; b=DDWa47HmfLsadvngVyvtzW24/Kw4CRddbHlv8IZEG/mRCtfyNQ9Ue97/K6xVnLAXpm ZZhVwQBeo8ROFUth0cYSAWPu/i1BNcFnt7LqDLm0+nE234GYKo3vBdw4MC5v6xF52MyK z4Ip0ssmiA3EINT2lpLUXG0C+4i0gd/+8Pmy92ofUuNCpts2TOgFlTI7QkGmxfAxRQl9 PVFcKH6OG+UFMAb9aHGt9mpjQOGw6B99Y8ewLm9lt58YZOZzOjeMF4MeIL4IGPAC05rz h+NIuzbbONM4EGtIUtki+1rmFewQt+ZUzBIPbwQdDRAuEPXWSyVJaMKfQ55duyBZ4K0j DIXg== X-Gm-Message-State: ACgBeo1jg44PEx/gMhIFZDGrUi2YOElavQh52KJFN8fLHXobkcYYSuw3 zM5ucW4TPTuqrmKAo+saon5soLZ6fY13fHRegdQOaROm X-Google-Smtp-Source: AA6agR4FRibfY3RPR95SDPLcgVMIs+jlo2nW4/EPWCm1rhOZdckzLvUREwi/GWK7UaJFs/ZknBa+plHllGiLvsFQ3tw= X-Received: by 2002:a25:198b:0:b0:690:65bb:9416 with SMTP id 133-20020a25198b000000b0069065bb9416mr22989171ybz.142.1661248405656; Tue, 23 Aug 2022 02:53:25 -0700 (PDT) MIME-Version: 1.0 From: Paul B Mahol Date: Tue, 23 Aug 2022 11:56:38 +0200 Message-ID: To: FFmpeg development discussions and patches Content-Type: multipart/mixed; boundary="0000000000001a9eee05e6e58906" X-Content-Filtered-By: Mailman/MimeDel 2.1.29 Subject: [FFmpeg-devel] [PATCH] avcodec/gif: fix duration of last packet/frame 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: --0000000000001a9eee05e6e58906 Content-Type: text/plain; charset="UTF-8" Hi, patch attached. --0000000000001a9eee05e6e58906 Content-Type: text/x-patch; charset="US-ASCII"; name="0001-avcodec-gif-fix-duration-of-last-packet-frame.patch" Content-Disposition: attachment; filename="0001-avcodec-gif-fix-duration-of-last-packet-frame.patch" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_l760ipam0 RnJvbSBmMTI2YzZlZjllNWZhOGI1MTI3MjUwOGFmNjYwM2YwNWMyNmEzZjI2IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBQYXVsIEIgTWFob2wgPG9uZW1kYUBnbWFpbC5jb20+CkRhdGU6 IFR1ZSwgMjMgQXVnIDIwMjIgMTE6NTE6MjQgKzAyMDAKU3ViamVjdDogW1BBVENIXSBhdmNvZGVj L2dpZjogZml4IGR1cmF0aW9uIG9mIGxhc3QgcGFja2V0L2ZyYW1lCgpGaXhlcyAjNjI5NAoKU2ln bmVkLW9mZi1ieTogUGF1bCBCIE1haG9sIDxvbmVtZGFAZ21haWwuY29tPgotLS0KIGxpYmF2Y29k ZWMvZ2lmLmMgIHwgIDIgKysKIGxpYmF2Zm9ybWF0L2dpZi5jIHwgMzMgKysrKysrKy0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tCiAyIGZpbGVzIGNoYW5nZWQsIDkgaW5zZXJ0aW9ucygrKSwgMjYg ZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvbGliYXZjb2RlYy9naWYuYyBiL2xpYmF2Y29kZWMv Z2lmLmMKaW5kZXggOGU4NGI3OWI4Yy4uMjQ4NGNjOTJlMiAxMDA2NDQKLS0tIGEvbGliYXZjb2Rl Yy9naWYuYworKysgYi9saWJhdmNvZGVjL2dpZi5jCkBAIC01MTMsNiArNTEzLDggQEAgc3RhdGlj IGludCBnaWZfZW5jb2RlX2ZyYW1lKEFWQ29kZWNDb250ZXh0ICphdmN0eCwgQVZQYWNrZXQgKnBr dCwKICAgICAgICAgICAgIHJldHVybiByZXQ7CiAgICAgfQogCisgICAgcGt0LT5kdXJhdGlvbiA9 IGF2X3Jlc2NhbGVfcShwaWN0LT5kdXJhdGlvbiwgKEFWUmF0aW9uYWwpeyAxLCAxMDAgfSwKKyAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGF2Y3R4LT50aW1lX2Jhc2UpOwogICAgIHBr dC0+c2l6ZSAgID0gb3V0YnVmX3B0ciAtIHBrdC0+ZGF0YTsKICAgICBpZiAocy0+aW1hZ2UgfHwg IWF2Y3R4LT5mcmFtZV9udW1iZXIpCiAgICAgICAgIHBrdC0+ZmxhZ3MgfD0gQVZfUEtUX0ZMQUdf S0VZOwpkaWZmIC0tZ2l0IGEvbGliYXZmb3JtYXQvZ2lmLmMgYi9saWJhdmZvcm1hdC9naWYuYwpp bmRleCBiNTJmZjRkZDM5Li5hZmI1NzY3NTQxIDEwMDY0NAotLS0gYS9saWJhdmZvcm1hdC9naWYu YworKysgYi9saWJhdmZvcm1hdC9naWYuYwpAQCAtMzYsNyArMzYsNiBAQCB0eXBlZGVmIHN0cnVj dCBHSUZDb250ZXh0IHsKICAgICBpbnQgZHVyYXRpb247CiAgICAgaW50NjRfdCBsYXN0X3BvczsK ICAgICBpbnQgaGF2ZV9lbmQ7Ci0gICAgQVZQYWNrZXQgKnByZXZfcGt0OwogfSBHSUZDb250ZXh0 OwogCiBzdGF0aWMgaW50IGdpZl93cml0ZV9oZWFkZXIoQVZGb3JtYXRDb250ZXh0ICpzKQpAQCAt ODEsMjggKzgwLDIwIEBAIHN0YXRpYyBpbnQgZ2lmX3BhcnNlX3BhY2tldChBVkZvcm1hdENvbnRl eHQgKnMsIGNvbnN0IHVpbnQ4X3QgKmRhdGEsIGludCBzaXplKQogICAgIHJldHVybiAwOwogfQog Ci1zdGF0aWMgaW50IGdpZl9nZXRfZGVsYXkoR0lGQ29udGV4dCAqZ2lmLCBBVlBhY2tldCAqcHJl diwgQVZQYWNrZXQgKm5ldykKK3N0YXRpYyBpbnQgZ2lmX2dldF9kZWxheShHSUZDb250ZXh0ICpn aWYsIEFWUGFja2V0ICpwa3QpCiB7Ci0gICAgaWYgKG5ldyAmJiBuZXctPnB0cyAhPSBBVl9OT1BU U19WQUxVRSkKLSAgICAgICAgZ2lmLT5kdXJhdGlvbiA9IGF2X2NsaXBfdWludDE2KG5ldy0+cHRz IC0gcHJldi0+cHRzKTsKLSAgICBlbHNlIGlmICghbmV3ICYmIGdpZi0+bGFzdF9kZWxheSA+PSAw KQorICAgIGlmIChwa3QtPmR1cmF0aW9uICE9IDApCisgICAgICAgIGdpZi0+ZHVyYXRpb24gPSBh dl9jbGlwX3VpbnQxNihwa3QtPmR1cmF0aW9uKTsKKyAgICBlbHNlIGlmICghcGt0ICYmIGdpZi0+ bGFzdF9kZWxheSA+PSAwKQogICAgICAgICBnaWYtPmR1cmF0aW9uID0gZ2lmLT5sYXN0X2RlbGF5 OwogCiAgICAgcmV0dXJuIGdpZi0+ZHVyYXRpb247CiB9CiAKLXN0YXRpYyBpbnQgZ2lmX3dyaXRl X3BhY2tldChBVkZvcm1hdENvbnRleHQgKnMsIEFWUGFja2V0ICpuZXdfcGt0KQorc3RhdGljIGlu dCBnaWZfd3JpdGVfcGFja2V0KEFWRm9ybWF0Q29udGV4dCAqcywgQVZQYWNrZXQgKnBrdCkKIHsK ICAgICBHSUZDb250ZXh0ICpnaWYgPSBzLT5wcml2X2RhdGE7CiAgICAgQVZJT0NvbnRleHQgKnBi ID0gcy0+cGI7Ci0gICAgQVZQYWNrZXQgKnBrdCA9IGdpZi0+cHJldl9wa3Q7Ci0KLSAgICBpZiAo IWdpZi0+cHJldl9wa3QpIHsKLSAgICAgICAgZ2lmLT5wcmV2X3BrdCA9IGF2X3BhY2tldF9hbGxv YygpOwotICAgICAgICBpZiAoIWdpZi0+cHJldl9wa3QpCi0gICAgICAgICAgICByZXR1cm4gQVZF UlJPUihFTk9NRU0pOwotICAgICAgICByZXR1cm4gYXZfcGFja2V0X3JlZihnaWYtPnByZXZfcGt0 LCBuZXdfcGt0KTsKLSAgICB9CiAKICAgICBnaWYtPmxhc3RfcG9zID0gYXZpb190ZWxsKHBiKTsK ICAgICBpZiAocGt0LT5zaXplID4gMCkKQEAgLTE0NCw3ICsxMzUsNyBAQCBzdGF0aWMgaW50IGdp Zl93cml0ZV9wYWNrZXQoQVZGb3JtYXRDb250ZXh0ICpzLCBBVlBhY2tldCAqbmV3X3BrdCkKICAg ICAgICAgZGVsYXlfcG9zID0gZ2lmX3BhcnNlX3BhY2tldChzLCBwa3QtPmRhdGEgKyBvZmYsIHBr dC0+c2l6ZSAtIG9mZik7CiAgICAgICAgIGlmIChkZWxheV9wb3MgPiAwICYmIGRlbGF5X3BvcyA8 IHBrdC0+c2l6ZSAtIG9mZiAtIDIpIHsKICAgICAgICAgICAgIGF2aW9fd3JpdGUocGIsIHBrdC0+ ZGF0YSArIG9mZiwgZGVsYXlfcG9zKTsKLSAgICAgICAgICAgIGF2aW9fd2wxNihwYiwgZ2lmX2dl dF9kZWxheShnaWYsIHBrdCwgbmV3X3BrdCkpOworICAgICAgICAgICAgYXZpb193bDE2KHBiLCBn aWZfZ2V0X2RlbGF5KGdpZiwgcGt0KSk7CiAgICAgICAgICAgICBhdmlvX3dyaXRlKHBiLCBwa3Qt PmRhdGEgKyBvZmYgKyBkZWxheV9wb3MgKyAyLCBwa3QtPnNpemUgLSBvZmYgLSBkZWxheV9wb3Mg LSAyKTsKICAgICAgICAgfSBlbHNlIHsKICAgICAgICAgICAgIGF2aW9fd3JpdGUocGIsIHBrdC0+ ZGF0YSArIG9mZiwgcGt0LT5zaXplIC0gb2ZmKTsKQEAgLTE1NCwxNyArMTQ1LDEzIEBAIHN0YXRp YyBpbnQgZ2lmX3dyaXRlX3BhY2tldChBVkZvcm1hdENvbnRleHQgKnMsIEFWUGFja2V0ICpuZXdf cGt0KQogCiAgICAgICAgIGlmIChkZWxheV9wb3MgPiAwICYmIGRlbGF5X3BvcyA8IHBrdC0+c2l6 ZSAtIDIpIHsKICAgICAgICAgICAgIGF2aW9fd3JpdGUocGIsIHBrdC0+ZGF0YSwgZGVsYXlfcG9z KTsKLSAgICAgICAgICAgIGF2aW9fd2wxNihwYiwgZ2lmX2dldF9kZWxheShnaWYsIHBrdCwgbmV3 X3BrdCkpOworICAgICAgICAgICAgYXZpb193bDE2KHBiLCBnaWZfZ2V0X2RlbGF5KGdpZiwgcGt0 KSk7CiAgICAgICAgICAgICBhdmlvX3dyaXRlKHBiLCBwa3QtPmRhdGEgKyBkZWxheV9wb3MgKyAy LCBwa3QtPnNpemUgLSBkZWxheV9wb3MgLSAyKTsKICAgICAgICAgfSBlbHNlIHsKICAgICAgICAg ICAgIGF2aW9fd3JpdGUocGIsIHBrdC0+ZGF0YSwgcGt0LT5zaXplKTsKICAgICAgICAgfQogICAg IH0KIAotICAgIGF2X3BhY2tldF91bnJlZihnaWYtPnByZXZfcGt0KTsKLSAgICBpZiAobmV3X3Br dCkKLSAgICAgICAgcmV0dXJuIGF2X3BhY2tldF9yZWYoZ2lmLT5wcmV2X3BrdCwgbmV3X3BrdCk7 Ci0KICAgICByZXR1cm4gMDsKIH0KIApAQCAtMTczLDE0ICsxNjAsOCBAQCBzdGF0aWMgaW50IGdp Zl93cml0ZV90cmFpbGVyKEFWRm9ybWF0Q29udGV4dCAqcykKICAgICBHSUZDb250ZXh0ICpnaWYg PSBzLT5wcml2X2RhdGE7CiAgICAgQVZJT0NvbnRleHQgKnBiID0gcy0+cGI7CiAKLSAgICBpZiAo IWdpZi0+cHJldl9wa3QpCi0gICAgICAgIHJldHVybiBBVkVSUk9SKEVJTlZBTCk7Ci0KLSAgICBn aWZfd3JpdGVfcGFja2V0KHMsIE5VTEwpOwotCiAgICAgaWYgKCFnaWYtPmhhdmVfZW5kKQogICAg ICAgICBhdmlvX3c4KHBiLCBHSUZfVFJBSUxFUik7Ci0gICAgYXZfcGFja2V0X2ZyZWUoJmdpZi0+ cHJldl9wa3QpOwogCiAgICAgcmV0dXJuIDA7CiB9Ci0tIAoyLjM3LjIKCg== --0000000000001a9eee05e6e58906 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". --0000000000001a9eee05e6e58906--