diff options
author | Anton Khirnov <anton@khirnov.net> | 2011-03-14 20:38:58 +0100 |
---|---|---|
committer | Ronald S. Bultje <rsbultje@gmail.com> | 2011-03-16 22:59:38 -0400 |
commit | 59f65d9579262651731e9a22845957d78b4c4f57 (patch) | |
tree | 3978aa992471ab5a963d82cad2b2d4f70fb66bdb /libavformat | |
parent | 4839c192de7782605e1b7c9cc84aaf692cf67284 (diff) | |
download | ffmpeg-59f65d9579262651731e9a22845957d78b4c4f57.tar.gz |
avio: make url_setbufsize internal.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
Diffstat (limited to 'libavformat')
-rw-r--r-- | libavformat/avio.h | 3 | ||||
-rw-r--r-- | libavformat/avio_internal.h | 3 | ||||
-rw-r--r-- | libavformat/aviobuf.c | 8 | ||||
-rw-r--r-- | libavformat/utils.c | 2 |
4 files changed, 11 insertions, 5 deletions
diff --git a/libavformat/avio.h b/libavformat/avio.h index 8b404d067d..36be9fe4dd 100644 --- a/libavformat/avio.h +++ b/libavformat/avio.h @@ -429,6 +429,7 @@ attribute_deprecated int64_t url_ftell(AVIOContext *s); attribute_deprecated int64_t url_fsize(AVIOContext *s); #define URL_EOF (-1) attribute_deprecated int url_fgetc(AVIOContext *s); +attribute_deprecated int url_setbufsize(AVIOContext *s, int buf_size); /** * @} */ @@ -586,8 +587,6 @@ static inline int url_is_streamed(AVIOContext *s) */ int url_fdopen(AVIOContext **s, URLContext *h); -/** @warning must be called before any I/O */ -int url_setbufsize(AVIOContext *s, int buf_size); #if FF_API_URL_RESETBUF /** Reset the buffer for reading or writing. * @note Will drop any data currently in the buffer without transmitting it. diff --git a/libavformat/avio_internal.h b/libavformat/avio_internal.h index 2e0b94c9ea..12578fac6c 100644 --- a/libavformat/avio_internal.h +++ b/libavformat/avio_internal.h @@ -63,4 +63,7 @@ int ffio_rewind_with_probe_data(AVIOContext *s, unsigned char *buf, int buf_size uint64_t ffio_read_varlen(AVIOContext *bc); +/** @warning must be called before any I/O */ +int ffio_set_buf_size(AVIOContext *s, int buf_size); + #endif // AVFORMAT_AVIO_INTERNAL_H diff --git a/libavformat/aviobuf.c b/libavformat/aviobuf.c index 86f4928d43..7d84b2b293 100644 --- a/libavformat/aviobuf.c +++ b/libavformat/aviobuf.c @@ -377,6 +377,10 @@ int64_t url_fsize(AVIOContext *s) { return avio_size(s); } +int url_setbufsize(AVIOContext *s, int buf_size) +{ + return ffio_set_buf_size(s, buf_size); +} #endif int avio_put_str(AVIOContext *s, const char *str) @@ -490,7 +494,7 @@ static void fill_buffer(AVIOContext *s) /* make buffer smaller in case it ended up large after probing */ if (s->buffer_size > max_buffer_size) { - url_setbufsize(s, max_buffer_size); + ffio_set_buf_size(s, max_buffer_size); s->checksum_ptr = dst = s->buffer; len = s->buffer_size; @@ -801,7 +805,7 @@ int url_fdopen(AVIOContext **s, URLContext *h) return 0; } -int url_setbufsize(AVIOContext *s, int buf_size) +int ffio_set_buf_size(AVIOContext *s, int buf_size) { uint8_t *buffer; buffer = av_malloc(buf_size); diff --git a/libavformat/utils.c b/libavformat/utils.c index b1c9755646..113728f389 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -621,7 +621,7 @@ int av_open_input_file(AVFormatContext **ic_ptr, const char *filename, goto fail; } if (buf_size > 0) { - url_setbufsize(pb, buf_size); + ffio_set_buf_size(pb, buf_size); } if (!fmt && (err = av_probe_input_buffer(pb, &fmt, filename, logctx, 0, logctx ? (*ic_ptr)->probesize : 0)) < 0) { goto fail; |