summaryrefslogtreecommitdiff
path: root/libavformat/wtv.c
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2011-03-03 20:11:45 +0100
committerMichael Niedermayer <michaelni@gmx.at>2011-03-05 02:29:31 +0100
commit384c9c2fa79f2f09ed4a5aa4c14ba3ffc6bdc790 (patch)
treea3ec8979530bffeb61b84161d1681120bf1234af /libavformat/wtv.c
parent773947ba76c575abc01ba128206c87440dad40ec (diff)
avio: add avio_tell macro as a replacement for url_ftell
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com> (cherry picked from commit a2704c9712ad35cc22e7e0d8a79b581c07fa383b)
Diffstat (limited to 'libavformat/wtv.c')
-rw-r--r--libavformat/wtv.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/wtv.c b/libavformat/wtv.c
index 6b8a58daeb..ade4a42e1b 100644
--- a/libavformat/wtv.c
+++ b/libavformat/wtv.c
@@ -468,7 +468,7 @@ static void get_attachment(AVFormatContext *s, AVIOContext *pb, int length)
char description[1024];
unsigned int filesize;
AVStream *st;
- int64_t pos = url_ftell(pb);
+ int64_t pos = avio_tell(pb);
avio_get_str16le(pb, INT_MAX, mime, sizeof(mime));
if (strcmp(mime, "image/jpeg"))
@@ -980,7 +980,7 @@ static int read_header(AVFormatContext *s, AVFormatParameters *ap)
return ret;
avio_seek(wtv->pb, -32, SEEK_CUR);
- timeline_pos = url_ftell(s->pb); // save before opening another file
+ timeline_pos = avio_tell(s->pb); // save before opening another file
/* read metadata */
pb = wtvfile_open(s, root, root_size, table_0_entries_legacy_attrib_le16);