summaryrefslogtreecommitdiff
path: root/libavformat/ffmetadec.c
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2011-03-07 21:50:25 +0100
committerRonald S. Bultje <rsbultje@gmail.com>2011-03-07 17:20:31 -0500
commit66e5b1df360a28b083bc9ec5a76e7add5f40ce1f (patch)
tree2de95f70d35fd95832de9db9c1061270dcf8ae19 /libavformat/ffmetadec.c
parent6a7e074eb98c4d45898d7f2920312db6899ee650 (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/ffmetadec.c')
-rw-r--r--libavformat/ffmetadec.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/ffmetadec.c b/libavformat/ffmetadec.c
index cc7e1da48f..ed65624520 100644
--- a/libavformat/ffmetadec.c
+++ b/libavformat/ffmetadec.c
@@ -48,7 +48,7 @@ static void get_line(AVIOContext *s, uint8_t *buf, int size)
buf[i++] = c;
}
buf[i] = 0;
- } while (!url_feof(s) && (buf[0] == ';' || buf[0] == '#' || buf[0] == 0));
+ } while (!s->eof_reached && (buf[0] == ';' || buf[0] == '#' || buf[0] == 0));
}
static AVChapter *read_chapter(AVFormatContext *s)
@@ -126,7 +126,7 @@ static int read_header(AVFormatContext *s, AVFormatParameters *ap)
AVMetadata **m = &s->metadata;
uint8_t line[1024];
- while(!url_feof(s->pb)) {
+ while(!s->pb->eof_reached) {
get_line(s->pb, line, sizeof(line));
if (!memcmp(line, ID_STREAM, strlen(ID_STREAM))) {