highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avio: avio_ prefix for url_fseek

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

8
libavformat/mpc.c
View File

@@ -98,7 +98,7 @@ static int mpc_read_header(AVFormatContext *s, AVFormatParameters *ap)
ff_ape_parse_tag(s);
if (!av_metadata_get(s->metadata, "", NULL, AV_METADATA_IGNORE_SUFFIX))
ff_id3v1_read(s);
url_fseek(s->pb, pos, SEEK_SET);
avio_seek(s->pb, pos, SEEK_SET);
}
return 0;
@@ -114,7 +114,7 @@ static int mpc_read_packet(AVFormatContext *s, AVPacket *pkt)
return -1;
if(c->curframe != c->lastframe + 1){
url_fseek(s->pb, c->frames[c->curframe].pos, SEEK_SET);
avio_seek(s->pb, c->frames[c->curframe].pos, SEEK_SET);
c->curbits = c->frames[c->curframe].skip;
}
c->lastframe = c->curframe;
@@ -129,7 +129,7 @@ static int mpc_read_packet(AVFormatContext *s, AVPacket *pkt)
size2 = (tmp >> (44 - curbits)) & 0xFFFFF;
}
curbits += 20;
url_fseek(s->pb, pos, SEEK_SET);
avio_seek(s->pb, pos, SEEK_SET);
size = ((size2 + curbits + 31) & ~31) >> 3;
if(cur == c->frames_noted){
@@ -153,7 +153,7 @@ static int mpc_read_packet(AVFormatContext *s, AVPacket *pkt)
pkt->pts = cur;
ret = avio_read(s->pb, pkt->data + 4, size);
if(c->curbits)
url_fseek(s->pb, -4, SEEK_CUR);
avio_seek(s->pb, -4, SEEK_CUR);
if(ret < size){
av_free_packet(pkt);
return AVERROR(EIO);