eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2026-01-05 21:55:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

avio: avio_ prefix for url_fseek

Browse Source 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 6b4aa5dac8)
This commit is contained in:
Anton Khirnov
2011-02-28 14:57:54 +01:00
committed by Michael Niedermayer
parent e9e9139cee
commit f59d8ff8cd
90 changed files with 352 additions and 347 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libavformat/rmdec.c
View File

@@ -363,7 +363,7 @@ static int rm_read_index(AVFormatContext *s)
skip:
if (next_off && url_ftell(pb) != next_off &&
url_fseek(pb, next_off, SEEK_SET) < 0)
avio_seek(pb, next_off, SEEK_SET) < 0)
return -1;
} while (next_off);
@@ -482,9 +482,9 @@ static int rm_read_header(AVFormatContext *s, AVFormatParameters *ap)
if (!data_off)
data_off = url_ftell(pb) - 18;
if (indx_off && !url_is_streamed(pb) && !(s->flags & AVFMT_FLAG_IGNIDX) &&
url_fseek(pb, indx_off, SEEK_SET) >= 0) {
avio_seek(pb, indx_off, SEEK_SET) >= 0) {
rm_read_index(s);
url_fseek(pb, data_off + 18, SEEK_SET);
avio_seek(pb, data_off + 18, SEEK_SET);
}
return 0;
@@ -904,7 +904,7 @@ static int64_t rm_read_dts(AVFormatContext *s, int stream_index,
if(rm->old_format)
return AV_NOPTS_VALUE;
url_fseek(s->pb, pos, SEEK_SET);
avio_seek(s->pb, pos, SEEK_SET);
rm->remaining_len=0;
for(;;){
int seq=1;