Revision 933e90a6

View differences:

libavformat/asfdec.c
25 25
#include "libavutil/avstring.h"
26 26
#include "libavcodec/mpegaudio.h"
27 27
#include "avformat.h"
28
#include "avio_internal.h"
28 29
#include "riff.h"
29 30
#include "asf.h"
30 31
#include "asfcrypt.h"
......
1243 1244

  
1244 1245
    /* Try using the protocol's read_seek if available */
1245 1246
    if(s->pb) {
1246
        int ret = av_url_read_fseek(s->pb, stream_index, pts, flags);
1247
        int ret = ffio_read_seek(s->pb, stream_index, pts, flags);
1247 1248
        if(ret >= 0)
1248 1249
            asf_reset_header(s);
1249 1250
        if (ret != AVERROR(ENOSYS))
libavformat/avio.h
415 415
 * @}
416 416
 */
417 417

  
418
attribute_deprecated int     av_url_read_fpause(AVIOContext *h,    int pause);
419
attribute_deprecated int64_t av_url_read_fseek( AVIOContext *h,    int stream_index,
420
                                                int64_t timestamp, int flags);
418 421

  
419 422
/**
420 423
 * @defgroup old_url_f_funcs Old url_f* functions
......
513 516
 */
514 517
int64_t avio_size(AVIOContext *s);
515 518

  
516
int av_url_read_fpause(AVIOContext *h, int pause);
517
int64_t av_url_read_fseek(AVIOContext *h, int stream_index,
518
                          int64_t timestamp, int flags);
519

  
520 519
/** @warning currently size is limited */
521 520
#ifdef __GNUC__
522 521
int avio_printf(AVIOContext *s, const char *fmt, ...) __attribute__ ((__format__ (__printf__, 2, 3)));
libavformat/avio_internal.h
66 66
/** @warning must be called before any I/O */
67 67
int ffio_set_buf_size(AVIOContext *s, int buf_size);
68 68

  
69
int     ffio_read_pause(AVIOContext *h,    int pause);
70
int64_t ffio_read_seek( AVIOContext *h,    int stream_index,
71
                        int64_t timestamp, int flags);
72

  
73

  
69 74
#endif // AVFORMAT_AVIO_INTERNAL_H
libavformat/aviobuf.c
397 397
{
398 398
    avio_flush(s);
399 399
}
400
int av_url_read_fpause(AVIOContext *s, int pause)
401
{
402
    return ffio_read_pause(s, pause);
403
}
404
int64_t av_url_read_fseek(AVIOContext *s, int stream_index,
405
                         int64_t timestamp, int flags)
406
{
407
    return ffio_read_seek(s, stream_index, timestamp, flags);
408
}
400 409
#endif
401 410

  
402 411
int avio_put_str(AVIOContext *s, const char *str)
......
971 980
}
972 981
#endif
973 982

  
974
int av_url_read_fpause(AVIOContext *s, int pause)
983
int ffio_read_pause(AVIOContext *s, int pause)
975 984
{
976 985
    if (!s->read_pause)
977 986
        return AVERROR(ENOSYS);
978 987
    return s->read_pause(s->opaque, pause);
979 988
}
980 989

  
981
int64_t av_url_read_fseek(AVIOContext *s, int stream_index,
982
                          int64_t timestamp, int flags)
990
int64_t ffio_read_seek(AVIOContext *s, int stream_index,
991
                       int64_t timestamp, int flags)
983 992
{
984 993
    URLContext *h = s->opaque;
985 994
    int64_t ret;
libavformat/flvdec.c
28 28
#include "libavcodec/bytestream.h"
29 29
#include "libavcodec/mpeg4audio.h"
30 30
#include "avformat.h"
31
#include "avio_internal.h"
31 32
#include "flv.h"
32 33

  
33 34
typedef struct {
......
461 462
static int flv_read_seek(AVFormatContext *s, int stream_index,
462 463
    int64_t ts, int flags)
463 464
{
464
    return av_url_read_fseek(s->pb, stream_index, ts, flags);
465
    return ffio_read_seek(s->pb, stream_index, ts, flags);
465 466
}
466 467

  
467 468
#if 0 /* don't know enough to implement this */
......
482 483
            ts = av_rescale_rnd(ts, 1000, AV_TIME_BASE,
483 484
                flags & AVSEEK_FLAG_BACKWARD ? AV_ROUND_DOWN : AV_ROUND_UP);
484 485
        }
485
        ret = av_url_read_fseek(s->pb, stream_index, ts, flags);
486
        ret = ffio_read_seek(s->pb, stream_index, ts, flags);
486 487
    }
487 488

  
488 489
    if (ret == AVERROR(ENOSYS))
libavformat/utils.c
2553 2553
    if (s->iformat->read_play)
2554 2554
        return s->iformat->read_play(s);
2555 2555
    if (s->pb)
2556
        return av_url_read_fpause(s->pb, 0);
2556
        return ffio_read_pause(s->pb, 0);
2557 2557
    return AVERROR(ENOSYS);
2558 2558
}
2559 2559

  
......
2562 2562
    if (s->iformat->read_pause)
2563 2563
        return s->iformat->read_pause(s);
2564 2564
    if (s->pb)
2565
        return av_url_read_fpause(s->pb, 1);
2565
        return ffio_read_pause(s->pb, 1);
2566 2566
    return AVERROR(ENOSYS);
2567 2567
}
2568 2568

  

Also available in: Unified diff