From 61e0d71946f58e8864776d7495318103c0552754 Mon Sep 17 00:00:00 2001 From: Andreas Rheinhardt Date: Thu, 16 Jan 2020 05:49:14 +0100 Subject: [PATCH] avformat/movenc, segafilmenc: Remove unnecessary avio_tell() When the faststart option for the mov/mp4 muxer is used, the current position (i.e. the size of the already written data pre-shifting) was evaluated twice: First in an initialization and then again later, overwriting the first value without having ever touched it. So remove the initialization. Also, the clone of this code in the Sega FILM muxer behaves the same and has been treated the same. Signed-off-by: Andreas Rheinhardt Signed-off-by: Michael Niedermayer --- libavformat/movenc.c | 2 +- libavformat/segafilmenc.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 9111ac300c089..fb44ee2c712d6 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -6720,7 +6720,7 @@ static int shift_data(AVFormatContext *s) { int ret = 0, moov_size; MOVMuxContext *mov = s->priv_data; - int64_t pos, pos_end = avio_tell(s->pb); + int64_t pos, pos_end; uint8_t *buf, *read_buf[2]; int read_buf_id = 0; int read_size[2]; diff --git a/libavformat/segafilmenc.c b/libavformat/segafilmenc.c index bd7c03faf5d77..28cb7bfc85a3c 100644 --- a/libavformat/segafilmenc.c +++ b/libavformat/segafilmenc.c @@ -212,7 +212,7 @@ static int film_init(AVFormatContext *format_context) static int shift_data(AVFormatContext *format_context, int64_t shift_size) { int ret = 0; - int64_t pos, pos_end = avio_tell(format_context->pb); + int64_t pos, pos_end; uint8_t *buf, *read_buf[2]; int read_buf_id = 0; int read_size[2];