Revision f59d8ff8 libavformat/ipmovie.c

View differences:

libavformat/ipmovie.c
133 133
            s->audio_chunk_size -= 6;
134 134
        }
135 135

  
136
        url_fseek(pb, s->audio_chunk_offset, SEEK_SET);
136
        avio_seek(pb, s->audio_chunk_offset, SEEK_SET);
137 137
        s->audio_chunk_offset = 0;
138 138

  
139 139
        if (s->audio_chunk_size != av_get_packet(pb, pkt, s->audio_chunk_size))
......
163 163
            return CHUNK_NOMEM;
164 164

  
165 165
        pkt->pos= s->decode_map_chunk_offset;
166
        url_fseek(pb, s->decode_map_chunk_offset, SEEK_SET);
166
        avio_seek(pb, s->decode_map_chunk_offset, SEEK_SET);
167 167
        s->decode_map_chunk_offset = 0;
168 168

  
169 169
        if (avio_read(pb, pkt->data, s->decode_map_chunk_size) !=
......
172 172
            return CHUNK_EOF;
173 173
        }
174 174

  
175
        url_fseek(pb, s->video_chunk_offset, SEEK_SET);
175
        avio_seek(pb, s->video_chunk_offset, SEEK_SET);
176 176
        s->video_chunk_offset = 0;
177 177

  
178 178
        if (avio_read(pb, pkt->data + s->decode_map_chunk_size,
......
193 193

  
194 194
    } else {
195 195

  
196
        url_fseek(pb, s->next_chunk_offset, SEEK_SET);
196
        avio_seek(pb, s->next_chunk_offset, SEEK_SET);
197 197
        chunk_type = CHUNK_DONE;
198 198

  
199 199
    }
......
299 299

  
300 300
        case OPCODE_END_OF_STREAM:
301 301
            debug_ipmovie("end of stream\n");
302
            url_fseek(pb, opcode_size, SEEK_CUR);
302
            avio_seek(pb, opcode_size, SEEK_CUR);
303 303
            break;
304 304

  
305 305
        case OPCODE_END_OF_CHUNK:
306 306
            debug_ipmovie("end of chunk\n");
307
            url_fseek(pb, opcode_size, SEEK_CUR);
307
            avio_seek(pb, opcode_size, SEEK_CUR);
308 308
            break;
309 309

  
310 310
        case OPCODE_CREATE_TIMER:
......
359 359

  
360 360
        case OPCODE_START_STOP_AUDIO:
361 361
            debug_ipmovie("start/stop audio\n");
362
            url_fseek(pb, opcode_size, SEEK_CUR);
362
            avio_seek(pb, opcode_size, SEEK_CUR);
363 363
            break;
364 364

  
365 365
        case OPCODE_INIT_VIDEO_BUFFERS:
......
393 393
        case OPCODE_UNKNOWN_14:
394 394
        case OPCODE_UNKNOWN_15:
395 395
            debug_ipmovie("unknown (but documented) opcode %02X\n", opcode_type);
396
            url_fseek(pb, opcode_size, SEEK_CUR);
396
            avio_seek(pb, opcode_size, SEEK_CUR);
397 397
            break;
398 398

  
399 399
        case OPCODE_SEND_BUFFER:
400 400
            debug_ipmovie("send buffer\n");
401
            url_fseek(pb, opcode_size, SEEK_CUR);
401
            avio_seek(pb, opcode_size, SEEK_CUR);
402 402
            break;
403 403

  
404 404
        case OPCODE_AUDIO_FRAME:
......
407 407
            /* log position and move on for now */
408 408
            s->audio_chunk_offset = url_ftell(pb);
409 409
            s->audio_chunk_size = opcode_size;
410
            url_fseek(pb, opcode_size, SEEK_CUR);
410
            avio_seek(pb, opcode_size, SEEK_CUR);
411 411
            break;
412 412

  
413 413
        case OPCODE_SILENCE_FRAME:
414 414
            debug_ipmovie("silence frame\n");
415
            url_fseek(pb, opcode_size, SEEK_CUR);
415
            avio_seek(pb, opcode_size, SEEK_CUR);
416 416
            break;
417 417

  
418 418
        case OPCODE_INIT_VIDEO_MODE:
419 419
            debug_ipmovie("initialize video mode\n");
420
            url_fseek(pb, opcode_size, SEEK_CUR);
420
            avio_seek(pb, opcode_size, SEEK_CUR);
421 421
            break;
422 422

  
423 423
        case OPCODE_CREATE_GRADIENT:
424 424
            debug_ipmovie("create gradient\n");
425
            url_fseek(pb, opcode_size, SEEK_CUR);
425
            avio_seek(pb, opcode_size, SEEK_CUR);
426 426
            break;
427 427

  
428 428
        case OPCODE_SET_PALETTE:
......
464 464

  
465 465
        case OPCODE_SET_PALETTE_COMPRESSED:
466 466
            debug_ipmovie("set palette compressed\n");
467
            url_fseek(pb, opcode_size, SEEK_CUR);
467
            avio_seek(pb, opcode_size, SEEK_CUR);
468 468
            break;
469 469

  
470 470
        case OPCODE_SET_DECODING_MAP:
......
473 473
            /* log position and move on for now */
474 474
            s->decode_map_chunk_offset = url_ftell(pb);
475 475
            s->decode_map_chunk_size = opcode_size;
476
            url_fseek(pb, opcode_size, SEEK_CUR);
476
            avio_seek(pb, opcode_size, SEEK_CUR);
477 477
            break;
478 478

  
479 479
        case OPCODE_VIDEO_DATA:
......
482 482
            /* log position and move on for now */
483 483
            s->video_chunk_offset = url_ftell(pb);
484 484
            s->video_chunk_size = opcode_size;
485
            url_fseek(pb, opcode_size, SEEK_CUR);
485
            avio_seek(pb, opcode_size, SEEK_CUR);
486 486
            break;
487 487

  
488 488
        default:
......
553 553
        CHUNK_PREAMBLE_SIZE)
554 554
        return AVERROR(EIO);
555 555
    chunk_type = AV_RL16(&chunk_preamble[2]);
556
    url_fseek(pb, -CHUNK_PREAMBLE_SIZE, SEEK_CUR);
556
    avio_seek(pb, -CHUNK_PREAMBLE_SIZE, SEEK_CUR);
557 557

  
558 558
    if (chunk_type == CHUNK_VIDEO)
559 559
        ipmovie->audio_type = CODEC_ID_NONE;  /* no audio */

Also available in: Unified diff