Revision 66e5b1df libavformat/avidec.c

View differences:

libavformat/avidec.c
178 178
#ifdef DEBUG_SEEK
179 179
            av_log(s, AV_LOG_ERROR, "pos:%"PRId64", len:%X\n", pos, len);
180 180
#endif
181
            if(url_feof(pb))
181
            if(pb->eof_reached)
182 182
                return -1;
183 183

  
184 184
            if(last_pos == pos || pos == base - 8)
......
195 195
            avio_rl32(pb);       /* size */
196 196
            duration = avio_rl32(pb);
197 197

  
198
            if(url_feof(pb))
198
            if(pb->eof_reached)
199 199
                return -1;
200 200

  
201 201
            pos = avio_tell(pb);
......
360 360
    codec_type = -1;
361 361
    frame_period = 0;
362 362
    for(;;) {
363
        if (url_feof(pb))
363
        if (pb->eof_reached)
364 364
            goto fail;
365 365
        tag = avio_rl32(pb);
366 366
        size = avio_rl32(pb);
......
989 989
    }
990 990

  
991 991
    memset(d, -1, sizeof(int)*8);
992
    for(i=sync=avio_tell(pb); !url_feof(pb); i++) {
992
    for(i=sync=avio_tell(pb); !pb->eof_reached; i++) {
993 993
        int j;
994 994

  
995 995
        for(j=0; j<7; j++)
......
1145 1145
#if defined(DEBUG_SEEK)
1146 1146
        av_log(s, AV_LOG_DEBUG, "%d cum_len=%"PRId64"\n", len, ast->cum_len);
1147 1147
#endif
1148
        if(url_feof(pb))
1148
        if(pb->eof_reached)
1149 1149
            return -1;
1150 1150

  
1151 1151
        if(last_pos == pos)
......
1203 1203
    printf("movi_end=0x%"PRIx64"\n", avi->movi_end);
1204 1204
#endif
1205 1205
    for(;;) {
1206
        if (url_feof(pb))
1206
        if (pb->eof_reached)
1207 1207
            break;
1208 1208
        tag = avio_rl32(pb);
1209 1209
        size = avio_rl32(pb);

Also available in: Unified diff