From patchwork Fri Jul 29 04:43:10 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 37030 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:1649:b0:8b:613a:194d with SMTP id no9csp660956pzb; Thu, 28 Jul 2022 21:43:48 -0700 (PDT) X-Google-Smtp-Source: AGRyM1sFOJxtXVGd2IyjlL+cvpRdMy+D+RMpRPeJod3dsIBJm+tr4/2VgWiwEIP7yynGQGRaG/dE X-Received: by 2002:aa7:d49a:0:b0:43c:fed4:c656 with SMTP id b26-20020aa7d49a000000b0043cfed4c656mr1812372edr.312.1659069828556; Thu, 28 Jul 2022 21:43:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1659069828; cv=none; d=google.com; s=arc-20160816; b=H/Bx6J3vziTIUbdK47FVfd1TfUDauC6PuqgLPQgFv1cAL7iY/pNwpfshVl5y07g2Y9 Uh55bA8+78kdXiSzcjcQOVUmR0VZoyUMYi4VDcqDtfYpdRimhBaXY0FkfvE0dT4aUqmI FZkVPmVn0nR7xEcIVuNhX5rKaOMBC/wbLF/MPGUgwfGsb8x2izTnApknCb0ihWk13G3F U652KYmCpmsvLUHgcdaY82H5og6h4ZUqb9suz3dOTeI7QOHw60cxCRA+cXF0PlSDKy9R gifs/F2zKyWtRvh1lW3LXm6rcPTfSDC91F76lIyUJI9foWG963nwEkiqppd/sYYnZUEf 5XyQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to:date :to:from:message-id:dkim-signature:delivered-to; bh=A/3ehBEjrejNEO0Y30VeSnP3p6nTCM910Bw4xbY2xZk=; b=iXmjIaBQ6uwNpLagM3mRC0LeiaJt9DyYzAANfqWJujFozB7qZxtMmfMec8S8RzTHnc jhpgE6N4cvOKf4J+Ok4UQ4l2wp/zyczbKGjHUNpYuyEIfF1m5Xm6xNbH/9w/4zA3REFR pX+q/wkgivqjAa2Ue0HbOgngtubKihLnyim8EpwLZCQZt06V1CDbdPLi1Li6LONCEvhd gS73oGXUaXARwgxXLyvzLRcizOBjABuBEhZk4YQmfba/d1nQaYb26j15xNlsTH+Cn0EX qf2w5vkTfw9yLsCE1qXQcrbbCVKj1jGudlUgBujzCbW/T67u30HIEEr4/9QI9SrSTMOZ qHwA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=jgb2hEw6; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=foxmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id eb9-20020a0564020d0900b0043be542b956si2834116edb.262.2022.07.28.21.43.48; Thu, 28 Jul 2022 21:43:48 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=jgb2hEw6; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=foxmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 837AB68B878; Fri, 29 Jul 2022 07:43:32 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out162-62-57-210.mail.qq.com (out162-62-57-210.mail.qq.com [162.62.57.210]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1F1E468B9DB for ; Fri, 29 Jul 2022 07:43:23 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1659069800; bh=USc8iUczaY3FkOOoL8fg3puWLR80H+0lFv12sL2kJYk=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=jgb2hEw6TucyiQuveYT8BCpDNoP4i3o7MTVkZ31ushFuyNHRzanjmg9BVkdQ7FC5Q 59K5uckUPqiocXghVvFsfvmMXYJFfRlLfLuYswAcj9IukhMpyDZgGHuj42FINYDkmd GRTpwnSm8oLkYMFXTg8wPtkgw2f80mc0WndSK5ho= Received: from black.localdomain ([113.116.29.125]) by newxmesmtplogicsvrszc13.qq.com (NewEsmtp) with SMTP id ACB228CC; Fri, 29 Jul 2022 12:43:11 +0800 X-QQ-mid: xmsmtpt1659069799t5q0lyj24 Message-ID: X-QQ-XMAILINFO: NMmJpeSXIGQNFd4HxjAm7esfCQy+gucBlpVeUkh7zr4tpjG5bM6UhSHabBE4CO ZM7rV5rZ7Vm91h+6aSta7gmLIrzc+8qaha+W2qqZ3ckXaMkN8FVywNbIvleqljgyjdMGRwLNz2NR vq6eKHISV6a8uM1rDLxhVfRiuqvUxismwvB7pqB9F/uQaw4pLZ8E/fxCjMr6LSz7lOYEFM+dDYi1 wMPX0nd1Oj8r1jiNYdlMn/Gw+wNP225exdiOR8PNe7TuN5Lex1RhrCjthYHtEj2CY/qI5cFnMkHx c77PwyLohQKHH83xRr4lA3yCBcPuAaPpCfUHJxkz9ktuzkWA8uAVu12P3/41RuqtekVGZ+bmdn0c WLA3IO1O6MMpjefs0C0uhGOAMFBTkG+vzMHAhnVsMup6FiJ/SMy4gnjhH1Vy6ux8KL5hCUWzmmWU cvqhs+cJGLGqO4tPTxqzQfEerNSETVCscuBemT6z5cSabt0vMMd+oItn9xtsYqTSbxa3eyKVS7j5 FIS6BSMipDdkv9BrSu6FwDPCoT/IDx3bK38/aQxuIiINHAnmEuR7lC0ZjH420erFxWGMrVHw7Hu7 nw7BrNp1gWj/BWC7s5HDcoR3MG6wd208OgvCcWSUZ9j7o8TLOn5ff5vgL7ooKbIYcIeMP5jDMdtZ 3dznmk7utcgioRg3HQAmg7pJ58C7MxiqJsurXRAIwksPb2XLzwBWJ2ROZeH5KZopytfviFaunQ20 0eHp8El+ZOMjQlZpUwumkjvsxVG/YokLAjymvio4oWRP6pIUHWAKu/t7pFPCVgkIGX2tU5T5jc7h /BZe0f3oYBcCMzmViwWoByKHv0Qr9Z3mthDWLv4iq0TUW9fM0UtrnUD10IpqMxzymt8p/NiCR8y5 wkTVRlqzBrTD9n+E7w+rMi6ARtaXyswpBVNNLuErurQ7KaWU2GkKWOAvJRnslznpdjJYeQ48TKuW khm+iTI5o= From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Fri, 29 Jul 2022 12:43:10 +0800 X-OQ-MSGID: <20220729044310.125-4-quinkblack@foxmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220729044310.125-1-quinkblack@foxmail.com> References: <20220729044310.125-1-quinkblack@foxmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 3/3] avformat/flvenc: fix shadowed variable ts 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 Cc: Zhao Zhili Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: ZH9P2QNYirtM From: Zhao Zhili --- libavformat/flvenc.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/libavformat/flvenc.c b/libavformat/flvenc.c index 1c4ffb985a..5d574fa790 100644 --- a/libavformat/flvenc.c +++ b/libavformat/flvenc.c @@ -993,12 +993,9 @@ static int flv_write_packet(AVFormatContext *s, AVPacket *pkt) flv->videosize += (avio_tell(pb) - cur_offset); flv->lasttimestamp = pkt->dts / 1000.0; if (pkt->flags & AV_PKT_FLAG_KEY) { - double ts = flv->lasttimestamp; - int64_t pos = cur_offset; - - flv->lastkeyframetimestamp = ts; - flv->lastkeyframelocation = pos; - ret = flv_append_keyframe_info(s, flv, ts, pos); + flv->lastkeyframetimestamp = flv->lasttimestamp; + flv->lastkeyframelocation = cur_offset; + ret = flv_append_keyframe_info(s, flv, flv->lasttimestamp, cur_offset); if (ret < 0) goto fail; }