diff options
| author | Martin Storsjö <martin@martin.st> | 2015-08-09 22:39:28 +0300 |
|---|---|---|
| committer | Martin Storsjö <martin@martin.st> | 2015-08-10 09:46:07 +0300 |
| commit | 83f254e65f938657a4dbec711e4c94252a72daf9 (patch) | |
| tree | 664073e399b6dae50937c55728ff687d2f4fb508 | |
| parent | 8e34089e265a6b01e1e3301e8864439d26793753 (diff) | |
| download | ffmpeg-83f254e65f938657a4dbec711e4c94252a72daf9.tar.gz | |
movenc: Rename reserved_moov_pos to reserved_header_pos
The same field is also used for writing the sidx index header,
for fragmented files, when the faststart flag is used.
Signed-off-by: Martin Storsjö <martin@martin.st>
| -rw-r--r-- | libavformat/movenc.c | 14 | ||||
| -rw-r--r-- | libavformat/movenc.h | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/libavformat/movenc.c b/libavformat/movenc.c index a19c64b652..feb6a8480b 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -3229,7 +3229,7 @@ static int mov_flush_fragment(AVFormatContext *s) if (mov->flags & FF_MOV_FLAG_DELAY_MOOV) { if (mov->flags & FF_MOV_FLAG_FASTSTART) - mov->reserved_moov_pos = avio_tell(s->pb); + mov->reserved_header_pos = avio_tell(s->pb); avio_flush(s->pb); mov->moov_written = 1; return 0; @@ -4011,7 +4011,7 @@ static int mov_write_header(AVFormatContext *s) mov->flags |= FF_MOV_FLAG_FRAG_KEYFRAME; } else { if (mov->flags & FF_MOV_FLAG_FASTSTART) - mov->reserved_moov_pos = avio_tell(pb); + mov->reserved_header_pos = avio_tell(pb); mov_write_mdat_tag(pb, mov); } @@ -4046,7 +4046,7 @@ static int mov_write_header(AVFormatContext *s) mov_write_moov_tag(pb, mov, s); mov->moov_written = 1; if (mov->flags & FF_MOV_FLAG_FASTSTART) - mov->reserved_moov_pos = avio_tell(pb); + mov->reserved_header_pos = avio_tell(pb); } return 0; @@ -4162,10 +4162,10 @@ static int shift_data(AVFormatContext *s) /* 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); - avio_seek(s->pb, mov->reserved_moov_pos + moov_size, SEEK_SET); + avio_seek(s->pb, mov->reserved_header_pos + moov_size, SEEK_SET); /* start reading at where the new moov will be placed */ - avio_seek(read_pb, mov->reserved_moov_pos, SEEK_SET); + avio_seek(read_pb, mov->reserved_header_pos, SEEK_SET); pos = avio_tell(read_pb); #define READ_BLOCK do { \ @@ -4232,7 +4232,7 @@ static int mov_write_trailer(AVFormatContext *s) av_log(s, AV_LOG_INFO, "Starting second pass: moving the moov atom to the beginning of the file\n"); res = shift_data(s); if (res == 0) { - avio_seek(pb, mov->reserved_moov_pos, SEEK_SET); + avio_seek(pb, mov->reserved_header_pos, SEEK_SET); mov_write_moov_tag(pb, mov, s); } } else { @@ -4247,7 +4247,7 @@ static int mov_write_trailer(AVFormatContext *s) res = shift_data(s); if (res == 0) { int64_t end = avio_tell(pb); - avio_seek(pb, mov->reserved_moov_pos, SEEK_SET); + avio_seek(pb, mov->reserved_header_pos, SEEK_SET); mov_write_sidx_tags(pb, mov, -1, 0); avio_seek(pb, end, SEEK_SET); mov_write_mfra_tag(pb, mov); diff --git a/libavformat/movenc.h b/libavformat/movenc.h index a61cfad273..6392d078a0 100644 --- a/libavformat/movenc.h +++ b/libavformat/movenc.h @@ -166,7 +166,7 @@ typedef struct MOVMuxContext { AVIOContext *mdat_buf; int first_trun; - int64_t reserved_moov_pos; + int64_t reserved_header_pos; char *major_brand; |