diff options
| author | Anton Khirnov <anton@khirnov.net> | 2011-03-03 20:11:45 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-03-05 02:29:31 +0100 |
| commit | 384c9c2fa79f2f09ed4a5aa4c14ba3ffc6bdc790 (patch) | |
| tree | a3ec8979530bffeb61b84161d1681120bf1234af /libavformat/gxf.c | |
| parent | 773947ba76c575abc01ba128206c87440dad40ec (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/gxf.c')
| -rw-r--r-- | libavformat/gxf.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavformat/gxf.c b/libavformat/gxf.c index e2625f9d41..dc0272d5c3 100644 --- a/libavformat/gxf.c +++ b/libavformat/gxf.c @@ -396,7 +396,7 @@ start: READ_ONE(); if (tmp != 1) goto start; - last_pos = url_ftell(pb); + last_pos = avio_tell(pb); if (avio_seek(pb, -5, SEEK_CUR) < 0) goto out; if (!parse_packet_header(pb, &type, &len) || type != PKT_MEDIA) { @@ -407,7 +407,7 @@ start: avio_r8(pb); cur_track = avio_r8(pb); cur_timestamp = avio_rb32(pb); - last_found_pos = url_ftell(pb) - 16 - 6; + last_found_pos = avio_tell(pb) - 16 - 6; if ((track >= 0 && track != cur_track) || (timestamp >= 0 && timestamp > cur_timestamp)) { if (avio_seek(pb, last_pos, SEEK_SET) >= 0) goto start; @@ -511,7 +511,7 @@ static int64_t gxf_read_timestamp(AVFormatContext *s, int stream_index, if (avio_seek(pb, *pos, SEEK_SET) < 0) return AV_NOPTS_VALUE; res = gxf_resync_media(s, pos_limit - *pos, -1, -1); - *pos = url_ftell(pb); + *pos = avio_tell(pb); return res; } |