X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavformat%2Fflvenc.c;h=5cf3ce8a1abe44df09ef4eeca6edc1305d9d8ed3;hb=a8867850185a14e580dfeed2b39e8aae5e306e7c;hp=1aaf0333caf50d23c17df37ee85f89a8c55afa89;hpb=b0d0d7e4d0581ccfeea37cc3fd0d3ca9d999fbfc;p=ffmpeg diff --git a/libavformat/flvenc.c b/libavformat/flvenc.c index 1aaf0333caf..5cf3ce8a1ab 100644 --- a/libavformat/flvenc.c +++ b/libavformat/flvenc.c @@ -580,7 +580,7 @@ static int shift_data(AVFormatContext *s) int n = 0; int64_t metadata_size = 0; FLVContext *flv = s->priv_data; - int64_t pos, pos_end = avio_tell(s->pb); + int64_t pos, pos_end = avio_tell(s->pb); /* Save the pre-shift size. */ uint8_t *buf, *read_buf[2]; int read_buf_id = 0; int read_size[2]; @@ -608,7 +608,6 @@ static int shift_data(AVFormatContext *s) avio_seek(s->pb, flv->metadata_totalsize_pos, SEEK_SET); avio_wb32(s->pb, flv->metadata_totalsize + 11 + metadata_size); - avio_seek(s->pb, pos_end, SEEK_SET); /* Shift the data: the AVIO context of the output can only be used for * writing, so we re-open the same output, but for reading. It also avoids @@ -621,9 +620,7 @@ static int shift_data(AVFormatContext *s) goto end; } - /* mark the end of the shift to up to the last data we wrote, and get ready - * for writing */ - pos_end = avio_tell(s->pb); + /* Get ready for writing. */ avio_seek(s->pb, flv->keyframes_info_offset + metadata_size, SEEK_SET); /* start reading at where the keyframe index information will be placed */