eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-13 02:20:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

lavf: replace avio_seek(SEEK_CUR) with avio_skip where it makes sense

Browse Source 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
This commit is contained in:
Anton Khirnov
2011-03-15 09:14:38 +01:00
committed by Ronald S. Bultje
parent cbf5d22d24
commit 45a8a02a41
76 changed files with 348 additions and 348 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
libavformat/mpeg.c
View File

@@ -212,7 +212,7 @@ static long mpegps_psm_parse(MpegDemuxContext *m, AVIOContext *pb)
ps_info_length = avio_rb16(pb);
/* skip program_stream_info */
avio_seek(pb, ps_info_length, SEEK_CUR);
avio_skip(pb, ps_info_length);
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 */
avio_seek(pb, es_info_length, SEEK_CUR);
avio_skip(pb, es_info_length);
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) {
avio_seek(s->pb, avio_rb16(s->pb), SEEK_CUR);
avio_skip(s->pb, avio_rb16(s->pb));
goto redo;
}
if (startcode == PRIVATE_STREAM_2) {
@@ -281,7 +281,7 @@ static int mpegps_read_pes_header(AVFormatContext *s,
}
m->sofdec -= !m->sofdec;
}
avio_seek(s->pb, len, SEEK_CUR);
avio_skip(s->pb, len);
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;
}
avio_seek(s->pb, skip, SEEK_CUR);
avio_skip(s->pb, skip);
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;
avio_seek(s->pb, header_len, SEEK_CUR);
avio_skip(s->pb, header_len);
}
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);
avio_seek(s->pb, 3, SEEK_CUR);
avio_skip(s->pb, 3);
len -= 4;
}
@@ -525,7 +525,7 @@ static int mpegps_read_packet(AVFormatContext *s,
} else {
skip:
/* skip packet */
avio_seek(s->pb, len, SEEK_CUR);
avio_skip(s->pb, len);
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;
}
avio_seek(s->pb, len, SEEK_CUR);
avio_skip(s->pb, len);
}
#ifdef DEBUG_SEEK
printf("pos=0x%"PRIx64" dts=0x%"PRIx64" %0.3f\n", pos, dts, dts / 90000.0);