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/nsvdec.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/nsvdec.c')
| -rw-r--r-- | libavformat/nsvdec.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libavformat/nsvdec.c b/libavformat/nsvdec.c index 3bfebb263c..1dc7cb0869 100644 --- a/libavformat/nsvdec.c +++ b/libavformat/nsvdec.c @@ -230,7 +230,7 @@ static int nsv_resync(AVFormatContext *s) //nsv->state = NSV_UNSYNC; for (i = 0; i < NSV_MAX_RESYNC; i++) { - if (url_feof(pb)) { + if (pb->eof_reached) { av_dlog(s, "NSV EOF\n"); nsv->state = NSV_UNSYNC; return -1; @@ -296,7 +296,7 @@ static int nsv_parse_NSVf_header(AVFormatContext *s, AVFormatParameters *ap) table_entries_used = avio_rl32(pb); av_dlog(s, "NSV NSVf info-strings size: %d, table entries: %d, bis %d\n", strings_size, table_entries, table_entries_used); - if (url_feof(pb)) + if (pb->eof_reached) return -1; av_dlog(s, "NSV got header; filepos %"PRId64"\n", avio_tell(pb)); @@ -331,7 +331,7 @@ static int nsv_parse_NSVf_header(AVFormatContext *s, AVFormatParameters *ap) } av_free(strings); } - if (url_feof(pb)) + if (pb->eof_reached) return -1; av_dlog(s, "NSV got infos; filepos %"PRId64"\n", avio_tell(pb)); @@ -378,7 +378,7 @@ static int nsv_parse_NSVf_header(AVFormatContext *s, AVFormatParameters *ap) avio_seek(pb, nsv->base_offset + size, SEEK_SET); /* required for dumbdriving-271.nsv (2 extra bytes) */ - if (url_feof(pb)) + if (pb->eof_reached) return -1; nsv->state = NSV_HAS_READ_NSVF; return 0; @@ -554,7 +554,7 @@ static int nsv_read_chunk(AVFormatContext *s, int fill_header) return 0; //-1; /* hey! eat what you've in your plate first! */ null_chunk_retry: - if (url_feof(pb)) + if (pb->eof_reached) return -1; for (i = 0; i < NSV_MAX_RESYNC_TRIES && nsv->state < NSV_FOUND_NSVS && !err; i++) @@ -588,7 +588,7 @@ null_chunk_retry: vsize -= auxsize + sizeof(uint16_t) + sizeof(uint32_t); /* that's becoming braindead */ } - if (url_feof(pb)) + if (pb->eof_reached) return -1; if (!vsize && !asize) { nsv->state = NSV_UNSYNC; |