diff options
| author | Anton Khirnov <anton@khirnov.net> | 2011-02-28 14:57:54 +0100 |
|---|---|---|
| committer | Ronald S. Bultje <rsbultje@gmail.com> | 2011-03-01 12:12:33 -0500 |
| commit | 6b4aa5dac8f41aa452d0ce9a1bede9e59a303060 (patch) | |
| tree | a2790d8f7304a735dc8edf52207b823ceb73a7da /libavformat/gxf.c | |
| parent | 76d8846c4e918749b045ea2ee7399a069af5e4a5 (diff) | |
| download | ffmpeg-6b4aa5dac8f41aa452d0ce9a1bede9e59a303060.tar.gz | |
avio: avio_ prefix for url_fseek
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
Diffstat (limited to 'libavformat/gxf.c')
| -rw-r--r-- | libavformat/gxf.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libavformat/gxf.c b/libavformat/gxf.c index 5b8b33c5f2..b290035c90 100644 --- a/libavformat/gxf.c +++ b/libavformat/gxf.c @@ -397,10 +397,10 @@ start: if (tmp != 1) goto start; last_pos = url_ftell(pb); - if (url_fseek(pb, -5, SEEK_CUR) < 0) + if (avio_seek(pb, -5, SEEK_CUR) < 0) goto out; if (!parse_packet_header(pb, &type, &len) || type != PKT_MEDIA) { - if (url_fseek(pb, last_pos, SEEK_SET) < 0) + if (avio_seek(pb, last_pos, SEEK_SET) < 0) goto out; goto start; } @@ -409,12 +409,12 @@ start: cur_timestamp = avio_rb32(pb); last_found_pos = url_ftell(pb) - 16 - 6; if ((track >= 0 && track != cur_track) || (timestamp >= 0 && timestamp > cur_timestamp)) { - if (url_fseek(pb, last_pos, SEEK_SET) >= 0) + if (avio_seek(pb, last_pos, SEEK_SET) >= 0) goto start; } out: if (last_found_pos) - url_fseek(pb, last_found_pos, SEEK_SET); + avio_seek(pb, last_found_pos, SEEK_SET); return cur_timestamp; } @@ -495,7 +495,7 @@ static int gxf_seek(AVFormatContext *s, int stream_index, int64_t timestamp, int if (idx < st->nb_index_entries - 2) maxlen = st->index_entries[idx + 2].pos - pos; maxlen = FFMAX(maxlen, 200 * 1024); - res = url_fseek(s->pb, pos, SEEK_SET); + res = avio_seek(s->pb, pos, SEEK_SET); if (res < 0) return res; found = gxf_resync_media(s, maxlen, -1, timestamp); @@ -508,7 +508,7 @@ static int64_t gxf_read_timestamp(AVFormatContext *s, int stream_index, int64_t *pos, int64_t pos_limit) { AVIOContext *pb = s->pb; int64_t res; - if (url_fseek(pb, *pos, SEEK_SET) < 0) + 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); |