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/mov.c | |
| parent | 6a7e074eb98c4d45898d7f2920312db6899ee650 (diff) | |
| download | ffmpeg-66e5b1df360a28b083bc9ec5a76e7add5f40ce1f.tar.gz | |
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/mov.c')
| -rw-r--r-- | libavformat/mov.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/mov.c b/libavformat/mov.c index 34b5f8e754..db798154a0 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -259,7 +259,7 @@ static int mov_read_default(MOVContext *c, AVIOContext *pb, MOVAtom atom) if (atom.size < 0) atom.size = INT64_MAX; - while (total_size + 8 < atom.size && !url_feof(pb)) { + while (total_size + 8 < atom.size && !pb->eof_reached) { int (*parse)(MOVContext*, AVIOContext*, MOVAtom) = NULL; a.size = atom.size; a.type=0; @@ -2411,7 +2411,7 @@ static int mov_read_packet(AVFormatContext *s, AVPacket *pkt) mov->found_mdat = 0; if (!url_is_streamed(s->pb) || mov_read_default(mov, s->pb, (MOVAtom){ AV_RL32("root"), INT64_MAX }) < 0 || - url_feof(s->pb)) + s->pb->eof_reached) return AVERROR_EOF; av_dlog(s, "read fragments, offset 0x%llx\n", avio_tell(s->pb)); goto retry; |