diff options
| author | Anton Khirnov <anton@khirnov.net> | 2011-03-07 21:50:25 +0100 |
|---|---|---|
| committer | Ronald S. Bultje <rsbultje@gmail.com> | 2011-03-07 17:20:31 -0500 |
| commit | 66e5b1df360a28b083bc9ec5a76e7add5f40ce1f (patch) | |
| tree | 2de95f70d35fd95832de9db9c1061270dcf8ae19 /libavformat/rmdec.c | |
| parent | 6a7e074eb98c4d45898d7f2920312db6899ee650 (diff) | |
avio: deprecate url_feof
AVIOContext.eof_reached should be used directly instead.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
Diffstat (limited to 'libavformat/rmdec.c')
| -rw-r--r-- | libavformat/rmdec.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavformat/rmdec.c b/libavformat/rmdec.c index e2e9b0298c..4fd2e86759 100644 --- a/libavformat/rmdec.c +++ b/libavformat/rmdec.c @@ -409,7 +409,7 @@ static int rm_read_header(AVFormatContext *s, AVFormatParameters *ap) avio_rb32(pb); /* number of headers */ for(;;) { - if (url_feof(pb)) + if (pb->eof_reached) return -1; tag = avio_rl32(pb); tag_size = avio_rb32(pb); @@ -515,7 +515,7 @@ static int sync(AVFormatContext *s, int64_t *timestamp, int *flags, int *stream_ AVStream *st; uint32_t state=0xFFFFFFFF; - while(!url_feof(pb)){ + while(!pb->eof_reached){ int len, num, i; *pos= avio_tell(pb) - 3; if(rm->remaining_len > 0){ @@ -848,7 +848,7 @@ static int rm_read_packet(AVFormatContext *s, AVPacket *pkt) st = s->streams[i]; } - if(len<0 || url_feof(s->pb)) + if(len<0 || s->pb->eof_reached) return AVERROR(EIO); res = ff_rm_parse_packet (s, s->pb, st, st->priv_data, len, pkt, |