summaryrefslogtreecommitdiff
path: root/libavformat/movenc.c
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2011-02-28 14:57:54 +0100
committerMichael Niedermayer <michaelni@gmx.at>2011-03-03 14:15:03 +0100
commitf59d8ff8cd75796256344a5c635054427928c62d (patch)
tree2439f532e0149c535f41d71e59ea7e3122857421 /libavformat/movenc.c
parente9e9139ceec2b27afaee41ba728996f8cf518d90 (diff)
avio: avio_ prefix for url_fseek
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com> (cherry picked from commit 6b4aa5dac8f41aa452d0ce9a1bede9e59a303060)
Diffstat (limited to 'libavformat/movenc.c')
-rw-r--r--libavformat/movenc.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/libavformat/movenc.c b/libavformat/movenc.c
index 7179e7a828..361db17bb8 100644
--- a/libavformat/movenc.c
+++ b/libavformat/movenc.c
@@ -40,9 +40,9 @@
static int64_t updateSize(AVIOContext *pb, int64_t pos)
{
int64_t curpos = url_ftell(pb);
- url_fseek(pb, pos, SEEK_SET);
+ avio_seek(pb, pos, SEEK_SET);
avio_wb32(pb, curpos - pos); /* rewrite size */
- url_fseek(pb, curpos, SEEK_SET);
+ avio_seek(pb, curpos, SEEK_SET);
return curpos - pos;
}
@@ -131,9 +131,9 @@ static int mov_write_stsc_tag(AVIOContext *pb, MOVTrack *track)
}
}
curpos = url_ftell(pb);
- url_fseek(pb, entryPos, SEEK_SET);
+ avio_seek(pb, entryPos, SEEK_SET);
avio_wb32(pb, index); // rewrite size
- url_fseek(pb, curpos, SEEK_SET);
+ avio_seek(pb, curpos, SEEK_SET);
return updateSize(pb, pos);
}
@@ -156,9 +156,9 @@ static int mov_write_stss_tag(AVIOContext *pb, MOVTrack *track, uint32_t flag)
}
}
curpos = url_ftell(pb);
- url_fseek(pb, entryPos, SEEK_SET);
+ avio_seek(pb, entryPos, SEEK_SET);
avio_wb32(pb, index); // rewrite size
- url_fseek(pb, curpos, SEEK_SET);
+ avio_seek(pb, curpos, SEEK_SET);
return updateSize(pb, pos);
}
@@ -2236,16 +2236,16 @@ static int mov_write_trailer(AVFormatContext *s)
/* Write size of mdat tag */
if (mov->mdat_size+8 <= UINT32_MAX) {
- url_fseek(pb, mov->mdat_pos, SEEK_SET);
+ avio_seek(pb, mov->mdat_pos, SEEK_SET);
avio_wb32(pb, mov->mdat_size+8);
} else {
/* overwrite 'wide' placeholder atom */
- url_fseek(pb, mov->mdat_pos - 8, SEEK_SET);
+ avio_seek(pb, mov->mdat_pos - 8, SEEK_SET);
avio_wb32(pb, 1); /* special value: real atom size will be 64 bit value after tag field */
ffio_wfourcc(pb, "mdat");
avio_wb64(pb, mov->mdat_size+16);
}
- url_fseek(pb, moov_pos, SEEK_SET);
+ avio_seek(pb, moov_pos, SEEK_SET);
mov_write_moov_tag(pb, mov, s);