X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavformat%2Fnuv.c;h=e7f0eeae8e2577e10b83bb439a6d4e6ce3c28d73;hb=097bf149c92aeae8af7f3559878e046a047e892d;hp=2c02de1c6f190aebc7018a154c0606e5e4ae510e;hpb=2bf87dcc2d3079ead09b250df6932c94ff13504c;p=ffmpeg diff --git a/libavformat/nuv.c b/libavformat/nuv.c index 2c02de1c6f1..e7f0eeae8e2 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];