Revision 66e5b1df libavformat/nsvdec.c

View differences:

libavformat/nsvdec.c
230 230
    //nsv->state = NSV_UNSYNC;
231 231

  
232 232
    for (i = 0; i < NSV_MAX_RESYNC; i++) {
233
        if (url_feof(pb)) {
233
        if (pb->eof_reached) {
234 234
            av_dlog(s, "NSV EOF\n");
235 235
            nsv->state = NSV_UNSYNC;
236 236
            return -1;
......
296 296
    table_entries_used = avio_rl32(pb);
297 297
    av_dlog(s, "NSV NSVf info-strings size: %d, table entries: %d, bis %d\n",
298 298
            strings_size, table_entries, table_entries_used);
299
    if (url_feof(pb))
299
    if (pb->eof_reached)
300 300
        return -1;
301 301

  
302 302
    av_dlog(s, "NSV got header; filepos %"PRId64"\n", avio_tell(pb));
......
331 331
        }
332 332
        av_free(strings);
333 333
    }
334
    if (url_feof(pb))
334
    if (pb->eof_reached)
335 335
        return -1;
336 336

  
337 337
    av_dlog(s, "NSV got infos; filepos %"PRId64"\n", avio_tell(pb));
......
378 378

  
379 379
    avio_seek(pb, nsv->base_offset + size, SEEK_SET); /* required for dumbdriving-271.nsv (2 extra bytes) */
380 380

  
381
    if (url_feof(pb))
381
    if (pb->eof_reached)
382 382
        return -1;
383 383
    nsv->state = NSV_HAS_READ_NSVF;
384 384
    return 0;
......
554 554
        return 0; //-1; /* hey! eat what you've in your plate first! */
555 555

  
556 556
null_chunk_retry:
557
    if (url_feof(pb))
557
    if (pb->eof_reached)
558 558
        return -1;
559 559

  
560 560
    for (i = 0; i < NSV_MAX_RESYNC_TRIES && nsv->state < NSV_FOUND_NSVS && !err; i++)
......
588 588
        vsize -= auxsize + sizeof(uint16_t) + sizeof(uint32_t); /* that's becoming braindead */
589 589
    }
590 590

  
591
    if (url_feof(pb))
591
    if (pb->eof_reached)
592 592
        return -1;
593 593
    if (!vsize && !asize) {
594 594
        nsv->state = NSV_UNSYNC;

Also available in: Unified diff