[FFmpeg-cvslog] avformat/flvenc: fix shadowed variable ts

Zhao Zhili git at videolan.org
Wed Aug 3 13:04:28 EEST 2022


ffmpeg | branch: master | Zhao Zhili <zhilizhao at tencent.com> | Fri Jul 29 12:43:10 2022 +0800| [f56730fb6f21265963e11bf6d0928d03191f144c] | committer: Zhao Zhili

avformat/flvenc: fix shadowed variable ts

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f56730fb6f21265963e11bf6d0928d03191f144c
---

 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;
                 }



More information about the ffmpeg-cvslog mailing list