Revision a6aa7a1a

View differences:

libavformat/applehttp.c
113 113
        av_free_packet(&var->pkt);
114 114
        av_free(var->pb.buffer);
115 115
        if (var->input)
116
            url_close(var->input);
116
            ffurl_close(var->input);
117 117
        if (var->ctx) {
118 118
            var->ctx->pb = NULL;
119 119
            av_close_input_file(var->ctx);
......
291 291
            goto reload;
292 292
        }
293 293

  
294
        ret = url_open(&v->input,
295
                       v->segments[v->cur_seq_no - v->start_seq_no]->url,
296
                       AVIO_RDONLY);
294
        ret = ffurl_open(&v->input,
295
                         v->segments[v->cur_seq_no - v->start_seq_no]->url,
296
                         AVIO_RDONLY);
297 297
        if (ret < 0)
298 298
            return ret;
299 299
    }
300
    ret = url_read(v->input, buf, buf_size);
300
    ret = ffurl_read(v->input, buf, buf_size);
301 301
    if (ret > 0)
302 302
        return ret;
303 303
    if (ret < 0 && ret != AVERROR_EOF)
304 304
        return ret;
305
    url_close(v->input);
305
    ffurl_close(v->input);
306 306
    v->input = NULL;
307 307
    v->cur_seq_no++;
308 308

  
......
435 435
            av_log(s, AV_LOG_INFO, "Now receiving variant %d\n", i);
436 436
        } else if (first && !v->cur_needed && v->needed) {
437 437
            if (v->input)
438
                url_close(v->input);
438
                ffurl_close(v->input);
439 439
            v->input = NULL;
440 440
            v->needed = 0;
441 441
            changed = 1;
......
517 517
        struct variant *var = c->variants[i];
518 518
        int64_t pos = 0;
519 519
        if (var->input) {
520
            url_close(var->input);
520
            ffurl_close(var->input);
521 521
            var->input = NULL;
522 522
        }
523 523
        av_free_packet(&var->pkt);

Also available in: Unified diff