diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-04-13 02:49:22 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-04-13 02:49:22 +0200 |
| commit | 9891004ba91a126f56cd02c6f7a7b0c368a158b9 (patch) | |
| tree | 05dd1b2b9250a7d09d9e9142be55100a581d2396 /libavformat/aviobuf.c | |
| parent | a0f17473b37589d8e05f42fefa5a266a2b33831c (diff) | |
| parent | 578d6861a753eb0b9d277f7ec17d1502eb2bb35a (diff) | |
| download | ffmpeg-9891004ba91a126f56cd02c6f7a7b0c368a158b9.tar.gz | |
Merge remote branch 'qatar/master'
* qatar/master:
Partially merged:flvdec: Allow parsing keyframes metadata without seeking in most cases
Error out if vaapi is not found
avio: undeprecate av_url_read_fseek/fpause under nicer names
libvo-*: Don't use deprecated sample format names and enum names
DUPLICATE flvdec: Fix support for flvtool2 "keyframes based" generated index
DUPLICATE libavcodec: Use "const enum AVSampleFormat[]" in AVCodec initialization
Fix the conversion of AV_SAMPLE_FMT_FLT and _DBL to AV_SAMPLE_FMT_S32.
Convert some undefined 1<<31 shifts into 1U<<31.
Conflicts:
configure
libavcodec/libvo-aacenc.c
libavcodec/libvo-amrwbenc.c
libavformat/flvdec.c
Marged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/aviobuf.c')
| -rw-r--r-- | libavformat/aviobuf.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavformat/aviobuf.c b/libavformat/aviobuf.c index fb6a0c7b69..70084e9323 100644 --- a/libavformat/aviobuf.c +++ b/libavformat/aviobuf.c @@ -412,12 +412,12 @@ void put_flush_packet(AVIOContext *s) } int av_url_read_fpause(AVIOContext *s, int pause) { - return ffio_read_pause(s, pause); + return avio_pause(s, pause); } int64_t av_url_read_fseek(AVIOContext *s, int stream_index, int64_t timestamp, int flags) { - return ffio_read_seek(s, stream_index, timestamp, flags); + return avio_seek_time(s, stream_index, timestamp, flags); } void init_checksum(AVIOContext *s, unsigned long (*update_checksum)(unsigned long c, const uint8_t *p, unsigned int len), @@ -1022,14 +1022,14 @@ int url_fget_max_packet_size(AVIOContext *s) } #endif -int ffio_read_pause(AVIOContext *s, int pause) +int avio_pause(AVIOContext *s, int pause) { if (!s->read_pause) return AVERROR(ENOSYS); return s->read_pause(s->opaque, pause); } -int64_t ffio_read_seek(AVIOContext *s, int stream_index, +int64_t avio_seek_time(AVIOContext *s, int stream_index, int64_t timestamp, int flags) { URLContext *h = s->opaque; |