Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Rheinhardt <andreas.rheinhardt@gmail.com>2020-01-16 07:49:14 +0300
committerMichael Niedermayer <michael@niedermayer.cc>2020-01-17 22:17:55 +0300
commit61e0d71946f58e8864776d7495318103c0552754 (patch)
tree30fa59740f50e746279205855614f51d4a19818a /libavformat
parentc95dfe5cce98cde3e7fb14fbd04b3897f3927cec (diff)
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 <andreas.rheinhardt@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/movenc.c2
-rw-r--r--libavformat/segafilmenc.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/movenc.c b/libavformat/movenc.c
index 9111ac300c..fb44ee2c71 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 bd7c03faf5..28cb7bfc85 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];