Revision dce37564 libavformat/rtsp.c

View differences:

libavformat/rtsp.c
818 818
    int ret, len, len1;
819 819
    uint8_t buf[1024];
820 820

  
821
    ret = url_read_complete(rt->rtsp_hd, buf, 3);
821
    ret = ffurl_read_complete(rt->rtsp_hd, buf, 3);
822 822
    if (ret != 3)
823 823
        return;
824 824
    len = AV_RB16(buf + 1);
......
830 830
        len1 = len;
831 831
        if (len1 > sizeof(buf))
832 832
            len1 = sizeof(buf);
833
        ret = url_read_complete(rt->rtsp_hd, buf, len1);
833
        ret = ffurl_read_complete(rt->rtsp_hd, buf, len1);
834 834
        if (ret != len1)
835 835
            return;
836 836
        len -= len1;
......
855 855
    for (;;) {
856 856
        q = buf;
857 857
        for (;;) {
858
            ret = url_read_complete(rt->rtsp_hd, &ch, 1);
858
            ret = ffurl_read_complete(rt->rtsp_hd, &ch, 1);
859 859
#ifdef DEBUG_RTP_TCP
860 860
            av_dlog(s, "ret=%d c=%02x [%c]\n", ret, ch, ch);
861 861
#endif
......
903 903
    if (content_length > 0) {
904 904
        /* leave some room for a trailing '\0' (useful for simple parsing) */
905 905
        content = av_malloc(content_length + 1);
906
        (void)url_read_complete(rt->rtsp_hd, content, content_length);
906
        ffurl_read_complete(rt->rtsp_hd, content, content_length);
907 907
        content[content_length] = '\0';
908 908
    }
909 909
    if (content_ptr)

Also available in: Unified diff