diff options
| author | James Almer <jamrial@gmail.com> | 2014-08-07 17:12:41 -0300 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-08 00:48:38 +0200 |
| commit | d34ec64a22907173c13e687b815d94618d2dc85b (patch) | |
| tree | d53c26525699660773d9457d65ca980c21823351 /libavformat/nuv.c | |
| parent | 5c3c67126feb046e25359096225507bf6dfe7b27 (diff) | |
replace calls to url_feof() with avio_feof()
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/nuv.c')
| -rw-r--r-- | libavformat/nuv.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavformat/nuv.c b/libavformat/nuv.c index 2c02de1c6f..e7f0eeae8e 100644 --- a/libavformat/nuv.c +++ b/libavformat/nuv.c @@ -72,7 +72,7 @@ static int get_codec_data(AVIOContext *pb, AVStream *vst, if (!vst && !myth) return 1; // no codec data needed - while (!url_feof(pb)) { + while (!avio_feof(pb)) { int size, subtype; frametype = avio_r8(pb); @@ -236,7 +236,7 @@ static int nuv_packet(AVFormatContext *s, AVPacket *pkt) nuv_frametype frametype; int ret, size; - while (!url_feof(pb)) { + while (!avio_feof(pb)) { int copyhdrsize = ctx->rtjpg_video ? HDRSIZE : 0; uint64_t pos = avio_tell(pb); @@ -309,7 +309,7 @@ static int nuv_packet(AVFormatContext *s, AVPacket *pkt) static int nuv_resync(AVFormatContext *s, int64_t pos_limit) { AVIOContext *pb = s->pb; uint32_t tag = 0; - while(!url_feof(pb) && avio_tell(pb) < pos_limit) { + while(!avio_feof(pb) && avio_tell(pb) < pos_limit) { tag = (tag << 8) | avio_r8(pb); if (tag == MKBETAG('R','T','j','j') && (tag = avio_rb32(pb)) == MKBETAG('j','j','j','j') && @@ -339,7 +339,7 @@ static int64_t nuv_read_dts(AVFormatContext *s, int stream_index, if (!nuv_resync(s, pos_limit)) return AV_NOPTS_VALUE; - while (!url_feof(pb) && avio_tell(pb) < pos_limit) { + while (!avio_feof(pb) && avio_tell(pb) < pos_limit) { if (avio_read(pb, hdr, HDRSIZE) < HDRSIZE) return AV_NOPTS_VALUE; frametype = hdr[0]; |