Revision dce37564 libavformat/mmst.c

View differences:

libavformat/mmst.c
241 241
    MMSSCPacketType packet_type= -1;
242 242
    MMSContext *mms = &mmst->mms;
243 243
    for(;;) {
244
        read_result = url_read_complete(mms->mms_hd, mms->in_buffer, 8);
244
        read_result = ffurl_read_complete(mms->mms_hd, mms->in_buffer, 8);
245 245
        if (read_result != 8) {
246 246
            if(read_result < 0) {
247 247
                av_log(NULL, AV_LOG_ERROR,
......
261 261
            int length_remaining, hr;
262 262

  
263 263
            mmst->incoming_flags= mms->in_buffer[3];
264
            read_result= url_read_complete(mms->mms_hd, mms->in_buffer+8, 4);
264
            read_result= ffurl_read_complete(mms->mms_hd, mms->in_buffer+8, 4);
265 265
            if(read_result != 4) {
266 266
                av_log(NULL, AV_LOG_ERROR,
267 267
                       "Reading command packet length failed: %d (%s)\n",
......
281 281
                       length_remaining, sizeof(mms->in_buffer) - 12);
282 282
                return AVERROR_INVALIDDATA;
283 283
            }
284
            read_result = url_read_complete(mms->mms_hd, mms->in_buffer + 12,
284
            read_result = ffurl_read_complete(mms->mms_hd, mms->in_buffer + 12,
285 285
                                            length_remaining) ;
286 286
            if (read_result != length_remaining) {
287 287
                av_log(NULL, AV_LOG_ERROR,
......
319 319
            }
320 320
            mms->remaining_in_len    = length_remaining;
321 321
            mms->read_in_ptr         = mms->in_buffer;
322
            read_result= url_read_complete(mms->mms_hd, mms->in_buffer, length_remaining);
322
            read_result= ffurl_read_complete(mms->mms_hd, mms->in_buffer, length_remaining);
323 323
            if(read_result != length_remaining) {
324 324
                av_log(NULL, AV_LOG_ERROR,
325 325
                       "Failed to read packet data of size %d: %d (%s)\n",

Also available in: Unified diff