Revision e356fc57 libavformat/electronicarts.c

View differences:

libavformat/electronicarts.c
222 222
    ea->bytes        = avio_r8(pb);   /* 1=8-bit, 2=16-bit */
223 223
    ea->num_channels = avio_r8(pb);
224 224
    compression_type = avio_r8(pb);
225
    url_fskip(pb, 13);
225
    avio_seek(pb, 13, SEEK_CUR);
226 226

  
227 227
    switch (compression_type) {
228 228
    case 0:
......
261 261
{
262 262
    EaDemuxContext *ea = s->priv_data;
263 263
    AVIOContext *pb = s->pb;
264
    url_fskip(pb, 4);
264
    avio_seek(pb, 4, SEEK_CUR);
265 265
    ea->width  = avio_rl16(pb);
266 266
    ea->height = avio_rl16(pb);
267 267
    ea->time_base = (AVRational){1,15};
......
274 274
    EaDemuxContext *ea = s->priv_data;
275 275
    AVIOContext *pb = s->pb;
276 276

  
277
    url_fskip(pb, 16);
277
    avio_seek(pb, 16, SEEK_CUR);
278 278
    ea->time_base.den = avio_rl32(pb);
279 279
    ea->time_base.num = avio_rl32(pb);
280 280
    ea->video_codec = CODEC_ID_VP6;
......
316 316
            case SHEN_TAG :
317 317
                blockid = avio_rl32(pb);
318 318
                if (blockid == GSTR_TAG) {
319
                    url_fskip(pb, 4);
319
                    avio_seek(pb, 4, SEEK_CUR);
320 320
                } else if ((blockid & 0xFFFF)!=PT00_TAG) {
321 321
                    av_log (s, AV_LOG_ERROR, "unknown SCHl headerid\n");
322 322
                    return 0;
......
474 474
        /* audio data */
475 475
        case ISNh_TAG:
476 476
            /* header chunk also contains data; skip over the header portion*/
477
            url_fskip(pb, 32);
477
            avio_seek(pb, 32, SEEK_CUR);
478 478
            chunk_size -= 32;
479 479
        case ISNd_TAG:
480 480
        case SCDl_TAG:
481 481
        case SNDC_TAG:
482 482
        case SDEN_TAG:
483 483
            if (!ea->audio_codec) {
484
                url_fskip(pb, chunk_size);
484
                avio_seek(pb, chunk_size, SEEK_CUR);
485 485
                break;
486 486
            } else if (ea->audio_codec == CODEC_ID_PCM_S16LE_PLANAR ||
487 487
                       ea->audio_codec == CODEC_ID_MP3) {
488 488
                num_samples = avio_rl32(pb);
489
                url_fskip(pb, 8);
489
                avio_seek(pb, 8, SEEK_CUR);
490 490
                chunk_size -= 12;
491 491
            }
492 492
            ret = av_get_packet(pb, pkt, chunk_size);

Also available in: Unified diff