Revision e356fc57 libavformat/mpeg.c

View differences:

libavformat/mpeg.c
212 212
    ps_info_length = avio_rb16(pb);
213 213

  
214 214
    /* skip program_stream_info */
215
    url_fskip(pb, ps_info_length);
215
    avio_seek(pb, ps_info_length, SEEK_CUR);
216 216
    es_map_length = avio_rb16(pb);
217 217

  
218 218
    /* at least one es available? */
......
223 223
        /* remember mapping from stream id to stream type */
224 224
        m->psm_es_type[es_id] = type;
225 225
        /* skip program_stream_info */
226
        url_fskip(pb, es_info_length);
226
        avio_seek(pb, es_info_length, SEEK_CUR);
227 227
        es_map_length -= 4 + es_info_length;
228 228
    }
229 229
    avio_rb32(pb); /* crc32 */
......
264 264
    if (startcode == SYSTEM_HEADER_START_CODE)
265 265
        goto redo;
266 266
    if (startcode == PADDING_STREAM) {
267
        url_fskip(s->pb, avio_rb16(s->pb));
267
        avio_seek(s->pb, avio_rb16(s->pb), SEEK_CUR);
268 268
        goto redo;
269 269
    }
270 270
    if (startcode == PRIVATE_STREAM_2) {
......
281 281
            }
282 282
            m->sofdec -= !m->sofdec;
283 283
        }
284
        url_fskip(s->pb, len);
284
        avio_seek(s->pb, len, SEEK_CUR);
285 285
        goto redo;
286 286
    }
287 287
    if (startcode == PROGRAM_STREAM_MAP) {
......
359 359
                av_log(s, AV_LOG_WARNING, "pes_ext %X is invalid\n", pes_ext);
360 360
                pes_ext=skip=0;
361 361
            }
362
            url_fskip(s->pb, skip);
362
            avio_seek(s->pb, skip, SEEK_CUR);
363 363
            header_len -= skip;
364 364

  
365 365
            if (pes_ext & 0x01) { /* PES extension 2 */
......
375 375
        }
376 376
        if(header_len < 0)
377 377
            goto error_redo;
378
        url_fskip(s->pb, header_len);
378
        avio_seek(s->pb, header_len, SEEK_CUR);
379 379
    }
380 380
    else if( c!= 0xf )
381 381
        goto redo;
......
433 433

  
434 434
    if(startcode == 0x1bd) {
435 435
        dvdaudio_substream_type = avio_r8(s->pb);
436
        url_fskip(s->pb, 3);
436
        avio_seek(s->pb, 3, SEEK_CUR);
437 437
        len -= 4;
438 438
    }
439 439

  
......
525 525
    } else {
526 526
    skip:
527 527
        /* skip packet */
528
        url_fskip(s->pb, len);
528
        avio_seek(s->pb, len, SEEK_CUR);
529 529
        goto redo;
530 530
    }
531 531
    /* no stream found: add a new stream */
......
602 602
            dts != AV_NOPTS_VALUE) {
603 603
            break;
604 604
        }
605
        url_fskip(s->pb, len);
605
        avio_seek(s->pb, len, SEEK_CUR);
606 606
    }
607 607
#ifdef DEBUG_SEEK
608 608
    printf("pos=0x%"PRIx64" dts=0x%"PRIx64" %0.3f\n", pos, dts, dts / 90000.0);

Also available in: Unified diff