Revision 66e5b1df libavformat/wtv.c

View differences:

libavformat/wtv.c
79 79

  
80 80
    if (wf->error || url_ferror(pb))
81 81
        return -1;
82
    if (wf->position >= wf->length || url_feof(pb))
82
    if (wf->position >= wf->length || pb->eof_reached)
83 83
        return 0;
84 84

  
85 85
    buf_size = FFMIN(buf_size, wf->length - wf->position);
......
554 554
{
555 555
    ff_asf_guid guid;
556 556
    int length, type;
557
    while(!url_feof(pb)) {
557
    while(!pb->eof_reached) {
558 558
        char key[1024];
559 559
        ff_get_guid(pb, &guid);
560 560
        type   = avio_rl32(pb);
......
770 770
{
771 771
    WtvContext *wtv = s->priv_data;
772 772
    AVIOContext *pb = wtv->pb;
773
    while (!url_feof(pb)) {
773
    while (!pb->eof_reached) {
774 774
        ff_asf_guid g;
775 775
        int len, sid, consumed;
776 776

  
......
997 997
            while(1) {
998 998
                uint64_t timestamp = avio_rl64(pb);
999 999
                uint64_t frame_nb  = avio_rl64(pb);
1000
                if (url_feof(pb))
1000
                if (pb->eof_reached)
1001 1001
                    break;
1002 1002
                ff_add_index_entry(&wtv->index_entries, &wtv->nb_index_entries, &wtv->index_entries_allocated_size,
1003 1003
                                   0, timestamp, frame_nb, 0, AVINDEX_KEYFRAME);
......
1011 1011
                    while (1) {
1012 1012
                        uint64_t frame_nb = avio_rl64(pb);
1013 1013
                        uint64_t position = avio_rl64(pb);
1014
                        if (url_feof(pb))
1014
                        if (pb->eof_reached)
1015 1015
                            break;
1016 1016
                        for (i = wtv->nb_index_entries - 1; i >= 0; i--) {
1017 1017
                            AVIndexEntry *e = wtv->index_entries + i;

Also available in: Unified diff