From patchwork Thu Jul 14 07:00:51 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 36789 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:6da0:b0:8b:e47:9dbf with SMTP id wl32csp186081pzb; Thu, 14 Jul 2022 00:01:16 -0700 (PDT) X-Google-Smtp-Source: AGRyM1tv6BUIy1v30OZ5Zs9QNRQcAyD/ENJLrenaVtZshuZt9CDnCpnfFKwGgysEelDo9SUxk8sn X-Received: by 2002:a17:907:2cd3:b0:72b:5cc2:bc1f with SMTP id hg19-20020a1709072cd300b0072b5cc2bc1fmr7318656ejc.574.1657782075972; Thu, 14 Jul 2022 00:01:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1657782075; cv=none; d=google.com; s=arc-20160816; b=BMhj3XEZZMirw4GAjF6WJqfRZcUEg08yByc56G1ZkD56BoN1F7Lkplh3c+wENEOzEQ i/v6fZOWAozDYs7Yiopymgw7f4TdkoyLPWp3WrpWDQUsSa1viRJy2Ytea8SdHELbHjxD JFxUnOZhvvBfRes/udH40VbRuI3Q0l3k9RGkhDu579++jcJwZXOF28fmNCVJnKNmnfUf ndgFTli06OPS4jabxa+Ozwa6AIdkFKxhlCUN1MsTdN9my0bbAhyVG7m8LSVlgw5qQaxz agsIMtPA+OwM484HiimtSRvieLIf0BaRg3xTZ96c+rkVoMGj8gmzTsmYWuhGHdI0/1xw 22wQ== 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=yNPZ0Crxpbp3tM8PefWQPXDYI4s+ednJW+gpxcwVyuU=; b=TimJXrr5Vr7wXzaKEntWi+XT5/qWeqmBkKfXgeuLa6m0WbaZiJwOASOBbzrq7Hxanm bt2LDzaXhcn7MuI91xEaE3DFSNBkixPw8o/EQu8vYiCvILd4tL/IzUjbxraj+wThG1+o wi/X+1eznH5Jm85bmWC+tq/TV0Fc2oc/L8wQPT3addsw72FYCDOO79SeRN57ccZ50Emz s4z8DEbkUlj9iuzksQmGGI2qjRffU+MV2gx0foQJdPxI4xGCd9+vj7ocwsI3dQw0vx8c yNyF+WhqPIx6bRWy5VUFR/Qf/sOLUTFMaFgTfTndCAsmNTVCI+AyEyivWzn2p7xCW3us wPKQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=rUPT2ajE; 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 a10-20020a1709065f8a00b0072e6774afc6si998041eju.366.2022.07.14.00.01.15; Thu, 14 Jul 2022 00:01:15 -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=rUPT2ajE; 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 481F168B9C1; Thu, 14 Jul 2022 10:01:11 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out203-205-221-239.mail.qq.com (out203-205-221-239.mail.qq.com [203.205.221.239]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9DB2368B8CC for ; Thu, 14 Jul 2022 10:01:02 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1657782057; bh=EnAxAee2+hQLmvEP8U2BRBAmjDahwqKmuCXxvlL0H0c=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=rUPT2ajEiqB5TxGci/IgXFANmWEqzIlji+v8KGtHC7DM18B6bve7GehwrWNZtR1B9 bWEl46tFbPenHGu/fyevUxtKd3TtugptjANwN9PTPOSR5LXdloyc0gRmQKMs2rv5Q9 u6gKtE7cOMwALCLxQlJ9gG21VfknXHnbtZgeV8mQ= Received: from ZHILIZHAO-MB2.tencent.com ([113.108.77.63]) by newxmesmtplogicsvrszb7.qq.com (NewEsmtp) with SMTP id 34A1200; Thu, 14 Jul 2022 15:00:52 +0800 X-QQ-mid: xmsmtpt1657782052t02f641jv Message-ID: X-QQ-XMAILINFO: Nfm/+M6ONQ5707tWFqItM+pkXhnV5Sv0HdmmQzOU1oUtIbdj/QkH7XL3UpW29t zJONuVD+X5nToJkS2xrjp6PDqdjhfFo/pLzGZxLWZiQZd8wRgJY2cRT30JQzW9ByVtRqNNFoHCG7 Wt+kWpxwCYnRLGd2XwSt+7SVJnitGQzlXdY9UoKR+9YUg15VvyJkv4uiaVAVgv7r6ekTcnpLOHAr DPEjKRs1iiR9ArGIlhJ+ue139iLVq8neA4cNrmjWIyCd3LHlNI9BGRIgqif0WWj+9tp2IoxmLTmu wDuxlsQ+AWZuHZtm9fK9Xjd4pbrlqgLYu+9z1l0OLhWfixriu34Umik9knwLkN0yx0/1U9zQaAFi Ga6kHqCXPJkXAiqsPl22MSRSCS+TzjO8K9CXhF+beivoS/TA5c10hHT4AdeZKw9B/xhNIa549BBK 1L1mC+2T3WCSaC3PPSpdoV7303Xcb+NTgC0ADn4INd052Ax/K7hf9MDogAjS25KwiarH835uFF87 fAH7dmAT34ECYYZreVQEKh/SUD9SB4Y1WTo9ZKorukpH9qPAstirLZL62T7HDdmIZ+JbEPetiKOR zHQ2tn3otlS8pdogQ8Sg6TRE8E0YT6IYwhwO+jucL15OO5nLVgLhz45Aw24OsjjEuKRAVk1xehCv +SGuFqqWCnFLdsKbSm0VHZWqaFT3qnJYq33BRdn+bNbAcqY0YqieexMQTv23gqrttTDhzQvTKasY fTX0OgmQHZONP2oHObirJGUhVC5rwNDHxSF3UbDjs5q94wMhoqI/DpsTMT9wzD/MV1HM5VpssWOl XS0SIHqUeTiEEAmLDEinNMbaNCfnw/5NFghpz76+vYeGs/1uIHnIrmWP7273SLjzvlMo1avnUicP LAfyosu+0tAl88Yh/Hpr10m2rodgZOW6yDBbSA9hJVQocwIBkUA9DC7BJrVZdeB+4qUSKvgJgaIT 02tnSW0rQ= From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Thu, 14 Jul 2022 15:00:51 +0800 X-OQ-MSGID: <20220714070051.80849-1-quinkblack@foxmail.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 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: CyUSOggNthb0 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; }