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/matroskadec.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/matroskadec.c')
| -rw-r--r-- | libavformat/matroskadec.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index 4488dd6c50..72abfc1d56 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -831,7 +831,7 @@ static int ebml_parse_elem(MatroskaDemuxContext *matroska, return ebml_parse_nest(matroska, syntax->def.n, data); case EBML_PASS: return ebml_parse_id(matroska, syntax->def.n, id, data); case EBML_STOP: return 1; - default: return url_fseek(pb,length,SEEK_CUR)<0 ? AVERROR(EIO) : 0; + default: return avio_seek(pb,length,SEEK_CUR)<0 ? AVERROR(EIO) : 0; } if (res == AVERROR_INVALIDDATA) av_log(matroska->ctx, AV_LOG_ERROR, "Invalid element\n"); @@ -1130,7 +1130,7 @@ static void matroska_execute_seekhead(MatroskaDemuxContext *matroska) continue; /* seek */ - if (url_fseek(matroska->ctx->pb, offset, SEEK_SET) != offset) + if (avio_seek(matroska->ctx->pb, offset, SEEK_SET) != offset) continue; /* We don't want to lose our seekhead level, so we add @@ -1159,7 +1159,7 @@ static void matroska_execute_seekhead(MatroskaDemuxContext *matroska) } /* seek back */ - url_fseek(matroska->ctx->pb, before_pos, SEEK_SET); + avio_seek(matroska->ctx->pb, before_pos, SEEK_SET); matroska->level_up = level_up; matroska->current_id = saved_id; } @@ -1889,7 +1889,7 @@ static int matroska_read_seek(AVFormatContext *s, int stream_index, timestamp = FFMAX(timestamp, st->index_entries[0].timestamp); if ((index = av_index_search_timestamp(st, timestamp, flags)) < 0) { - url_fseek(s->pb, st->index_entries[st->nb_index_entries-1].pos, SEEK_SET); + avio_seek(s->pb, st->index_entries[st->nb_index_entries-1].pos, SEEK_SET); while ((index = av_index_search_timestamp(st, timestamp, flags)) < 0) { matroska_clear_queue(matroska); if (matroska_parse_cluster(matroska) < 0) @@ -1914,7 +1914,7 @@ static int matroska_read_seek(AVFormatContext *s, int stream_index, } } - url_fseek(s->pb, st->index_entries[index_min].pos, SEEK_SET); + avio_seek(s->pb, st->index_entries[index_min].pos, SEEK_SET); matroska->skip_to_keyframe = !(flags & AVSEEK_FLAG_ANY); matroska->skip_to_timecode = st->index_entries[index].timestamp; matroska->done = 0; |