Revision 22a3212e libavformat/utils.c

View differences:

libavformat/utils.c
616 616
       hack needed to handle RTSP/TCP */
617 617
    if (!fmt || !(fmt->flags & AVFMT_NOFILE)) {
618 618
        /* if no file needed do not try to open one */
619
        if ((err=url_fopen(&pb, filename, URL_RDONLY)) < 0) {
619
        if ((err=avio_open(&pb, filename, URL_RDONLY)) < 0) {
620 620
            goto fail;
621 621
        }
622 622
        if (buf_size > 0) {
......
647 647
 fail:
648 648
    av_freep(&pd->buf);
649 649
    if (pb)
650
        url_fclose(pb);
650
        avio_close(pb);
651 651
    if (ap && ap->prealloced_context)
652 652
        av_free(*ic_ptr);
653 653
    *ic_ptr = NULL;
......
2623 2623
    AVIOContext *pb = s->iformat->flags & AVFMT_NOFILE ? NULL : s->pb;
2624 2624
    av_close_input_stream(s);
2625 2625
    if (pb)
2626
        url_fclose(pb);
2626
        avio_close(pb);
2627 2627
}
2628 2628

  
2629 2629
AVStream *av_new_stream(AVFormatContext *s, int id)

Also available in: Unified diff