diff options
| author | Anton Khirnov | 2011-02-28 14:57:55 +0100 |
|---|---|---|
| committer | Michael Niedermayer | 2011-03-03 14:15:08 +0100 |
| commit | 74b3f67c9c0a237843a3379391b9929e9bcfcb6e (patch) | |
| tree | 091bff9913be9ca258a72dfc0b11a91c424b1243 /libavformat/mpeg.c | |
| parent | f59d8ff8cd75796256344a5c635054427928c62d (diff) | |
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/mpeg.c')
| -rw-r--r-- | libavformat/mpeg.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/libavformat/mpeg.c b/libavformat/mpeg.c index 6c7481e79c..a1ba6aa203 100644 --- a/libavformat/mpeg.c +++ b/libavformat/mpeg.c @@ -212,7 +212,7 @@ static long mpegps_psm_parse(MpegDemuxContext *m, AVIOContext *pb) ps_info_length = avio_rb16(pb); /* skip program_stream_info */ - url_fskip(pb, ps_info_length); + avio_seek(pb, ps_info_length, SEEK_CUR); es_map_length = avio_rb16(pb); /* at least one es available? */ @@ -223,7 +223,7 @@ static long mpegps_psm_parse(MpegDemuxContext *m, AVIOContext *pb) /* remember mapping from stream id to stream type */ m->psm_es_type[es_id] = type; /* skip program_stream_info */ - url_fskip(pb, es_info_length); + avio_seek(pb, es_info_length, SEEK_CUR); es_map_length -= 4 + es_info_length; } avio_rb32(pb); /* crc32 */ @@ -264,7 +264,7 @@ static int mpegps_read_pes_header(AVFormatContext *s, if (startcode == SYSTEM_HEADER_START_CODE) goto redo; if (startcode == PADDING_STREAM) { - url_fskip(s->pb, avio_rb16(s->pb)); + avio_seek(s->pb, avio_rb16(s->pb), SEEK_CUR); goto redo; } if (startcode == PRIVATE_STREAM_2) { @@ -281,7 +281,7 @@ static int mpegps_read_pes_header(AVFormatContext *s, } m->sofdec -= !m->sofdec; } - url_fskip(s->pb, len); + avio_seek(s->pb, len, SEEK_CUR); goto redo; } if (startcode == PROGRAM_STREAM_MAP) { @@ -359,7 +359,7 @@ static int mpegps_read_pes_header(AVFormatContext *s, av_log(s, AV_LOG_WARNING, "pes_ext %X is invalid\n", pes_ext); pes_ext=skip=0; } - url_fskip(s->pb, skip); + avio_seek(s->pb, skip, SEEK_CUR); header_len -= skip; if (pes_ext & 0x01) { /* PES extension 2 */ @@ -375,7 +375,7 @@ static int mpegps_read_pes_header(AVFormatContext *s, } if(header_len < 0) goto error_redo; - url_fskip(s->pb, header_len); + avio_seek(s->pb, header_len, SEEK_CUR); } else if( c!= 0xf ) goto redo; @@ -433,7 +433,7 @@ static int mpegps_read_packet(AVFormatContext *s, if(startcode == 0x1bd) { dvdaudio_substream_type = avio_r8(s->pb); - url_fskip(s->pb, 3); + avio_seek(s->pb, 3, SEEK_CUR); len -= 4; } @@ -525,7 +525,7 @@ static int mpegps_read_packet(AVFormatContext *s, } else { skip: /* skip packet */ - url_fskip(s->pb, len); + avio_seek(s->pb, len, SEEK_CUR); goto redo; } /* no stream found: add a new stream */ @@ -602,7 +602,7 @@ static int64_t mpegps_read_dts(AVFormatContext *s, int stream_index, dts != AV_NOPTS_VALUE) { break; } - url_fskip(s->pb, len); + avio_seek(s->pb, len, SEEK_CUR); } #ifdef DEBUG_SEEK printf("pos=0x%"PRIx64" dts=0x%"PRIx64" %0.3f\n", pos, dts, dts / 90000.0); |