diff options
| author | Anton Khirnov <anton@khirnov.net> | 2011-02-28 14:57:55 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-03-03 14:15:08 +0100 |
| commit | 74b3f67c9c0a237843a3379391b9929e9bcfcb6e (patch) | |
| tree | 091bff9913be9ca258a72dfc0b11a91c424b1243 /libavformat/anm.c | |
| parent | f59d8ff8cd75796256344a5c635054427928c62d (diff) | |
| download | ffmpeg-74b3f67c9c0a237843a3379391b9929e9bcfcb6e.tar.gz | |
lavf: replace all uses of url_fskip with avio_seek
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit e356fc57a2e9887370caec58d8aafeafd1f336dc)
Diffstat (limited to 'libavformat/anm.c')
| -rw-r--r-- | libavformat/anm.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/libavformat/anm.c b/libavformat/anm.c index 463beee345..060cc9a086 100644 --- a/libavformat/anm.c +++ b/libavformat/anm.c @@ -83,7 +83,7 @@ static int read_header(AVFormatContext *s, AVStream *st; int i, ret; - url_fskip(pb, 4); /* magic number */ + avio_seek(pb, 4, SEEK_CUR); /* magic number */ if (avio_rl16(pb) != MAX_PAGES) { av_log_ask_for_sample(s, "max_pages != " AV_STRINGIFY(MAX_PAGES) "\n"); return AVERROR_INVALIDDATA; @@ -91,7 +91,7 @@ static int read_header(AVFormatContext *s, anm->nb_pages = avio_rl16(pb); anm->nb_records = avio_rl32(pb); - url_fskip(pb, 2); /* max records per page */ + avio_seek(pb, 2, SEEK_CUR); /* max records per page */ anm->page_table_offset = avio_rl16(pb); if (avio_rl32(pb) != ANIM_TAG) return AVERROR_INVALIDDATA; @@ -107,13 +107,13 @@ static int read_header(AVFormatContext *s, st->codec->height = avio_rl16(pb); if (avio_r8(pb) != 0) goto invalid; - url_fskip(pb, 1); /* frame rate multiplier info */ + avio_seek(pb, 1, SEEK_CUR); /* frame rate multiplier info */ /* ignore last delta record (used for looping) */ if (avio_r8(pb)) /* has_last_delta */ anm->nb_records = FFMAX(anm->nb_records - 1, 0); - url_fskip(pb, 1); /* last_delta_valid */ + avio_seek(pb, 1, SEEK_CUR); /* last_delta_valid */ if (avio_r8(pb) != 0) goto invalid; @@ -121,15 +121,15 @@ static int read_header(AVFormatContext *s, if (avio_r8(pb) != 1) goto invalid; - url_fskip(pb, 1); /* other recs per frame */ + avio_seek(pb, 1, SEEK_CUR); /* other recs per frame */ if (avio_r8(pb) != 1) goto invalid; - url_fskip(pb, 32); /* record_types */ + avio_seek(pb, 32, SEEK_CUR); /* record_types */ st->nb_frames = avio_rl32(pb); av_set_pts_info(st, 64, 1, avio_rl16(pb)); - url_fskip(pb, 58); + avio_seek(pb, 58, SEEK_CUR); /* color cycling and palette data */ st->codec->extradata_size = 16*8 + 4*256; @@ -193,7 +193,7 @@ repeat: /* parse page header */ if (anm->record < 0) { avio_seek(pb, anm->page_table_offset + MAX_PAGES*6 + (anm->page<<16), SEEK_SET); - url_fskip(pb, 8 + 2*p->nb_records); + avio_seek(pb, 8 + 2*p->nb_records, SEEK_CUR); anm->record = 0; } |