summaryrefslogtreecommitdiff
path: root/libavformat/mmf.c
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2011-03-03 20:11:45 +0100
committerRonald S. Bultje <rsbultje@gmail.com>2011-03-04 11:26:57 -0500
commita2704c9712ad35cc22e7e0d8a79b581c07fa383b (patch)
treeebf5a27a98dbd52d983e38e901661f7525b38e9a /libavformat/mmf.c
parente16ead0716c2f988d1e26369a4c67b354ff86134 (diff)
avio: add avio_tell macro as a replacement for url_ftell
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
Diffstat (limited to 'libavformat/mmf.c')
-rw-r--r--libavformat/mmf.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/libavformat/mmf.c b/libavformat/mmf.c
index a68870c1c2..0f5cee4f71 100644
--- a/libavformat/mmf.c
+++ b/libavformat/mmf.c
@@ -52,7 +52,7 @@ static void end_tag_be(AVIOContext *pb, int64_t start)
{
int64_t pos;
- pos = url_ftell(pb);
+ pos = avio_tell(pb);
avio_seek(pb, start - 4, SEEK_SET);
avio_wb32(pb, (uint32_t)(pos - start));
avio_seek(pb, pos, SEEK_SET);
@@ -84,7 +84,7 @@ static int mmf_write_header(AVFormatContext *s)
avio_write(pb, "ATR\x00", 4);
avio_wb32(pb, 0);
- mmf->atrpos = url_ftell(pb);
+ mmf->atrpos = avio_tell(pb);
avio_w8(pb, 0); /* format type */
avio_w8(pb, 0); /* sequence type */
avio_w8(pb, (0 << 7) | (1 << 4) | rate); /* (channel << 7) | (format << 4) | rate */
@@ -94,7 +94,7 @@ static int mmf_write_header(AVFormatContext *s)
ffio_wfourcc(pb, "Atsq");
avio_wb32(pb, 16);
- mmf->atsqpos = url_ftell(pb);
+ mmf->atsqpos = avio_tell(pb);
/* Will be filled on close */
avio_write(pb, "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", 16);
@@ -139,7 +139,7 @@ static int mmf_write_trailer(AVFormatContext *s)
end_tag_be(pb, mmf->atrpos);
end_tag_be(pb, 8);
- pos = url_ftell(pb);
+ pos = avio_tell(pb);
size = pos - mmf->awapos;
/* Fill Atsq chunk */