Revision dce37564 libavformat/mmsh.c

View differences:

libavformat/mmsh.c
79 79
    ChunkType chunk_type;
80 80
    int chunk_len, res, ext_header_len;
81 81

  
82
    res = url_read_complete(mms->mms_hd, chunk_header, CHUNK_HEADER_LENGTH);
82
    res = ffurl_read_complete(mms->mms_hd, chunk_header, CHUNK_HEADER_LENGTH);
83 83
    if (res != CHUNK_HEADER_LENGTH) {
84 84
        av_log(NULL, AV_LOG_ERROR, "Read data packet header failed!\n");
85 85
        return AVERROR(EIO);
......
101 101
        return AVERROR_INVALIDDATA;
102 102
    }
103 103

  
104
    res = url_read_complete(mms->mms_hd, ext_header, ext_header_len);
104
    res = ffurl_read_complete(mms->mms_hd, ext_header, ext_header_len);
105 105
    if (res != ext_header_len) {
106 106
        av_log(NULL, AV_LOG_ERROR, "Read ext header failed!\n");
107 107
        return AVERROR(EIO);
......
122 122
               len, sizeof(mms->in_buffer));
123 123
        return AVERROR(EIO);
124 124
    }
125
    res = url_read_complete(mms->mms_hd, mms->in_buffer, len);
125
    res = ffurl_read_complete(mms->mms_hd, mms->in_buffer, len);
126 126
    av_dlog(NULL, "Data packet len = %d\n", len);
127 127
    if (res != len) {
128 128
        av_log(NULL, AV_LOG_ERROR, "Read data packet failed!\n");
......
174 174
                       len, mms->asf_header_size);
175 175
                return AVERROR(EIO);
176 176
            }
177
            res = url_read_complete(mms->mms_hd, mms->asf_header, len);
177
            res = ffurl_read_complete(mms->mms_hd, mms->asf_header, len);
178 178
            if (res != len) {
179 179
                av_log(NULL, AV_LOG_ERROR,
180 180
                       "Recv asf header data len %d != expected len %d\n", res, len);
......
197 197
                           len, sizeof(mms->in_buffer));
198 198
                    return AVERROR(EIO);
199 199
                }
200
                res = url_read_complete(mms->mms_hd, mms->in_buffer, len);
200
                res = ffurl_read_complete(mms->mms_hd, mms->in_buffer, len);
201 201
                if (res != len) {
202 202
                    av_log(NULL, AV_LOG_ERROR, "Read other chunk type data failed!\n");
203 203
                    return AVERROR(EIO);

Also available in: Unified diff