diff options
Diffstat (limited to 'libavformat')
-rw-r--r-- | libavformat/avio.h | 6 | ||||
-rw-r--r-- | libavformat/aviobuf.c | 17 | ||||
-rw-r--r-- | libavformat/version.h | 2 |
3 files changed, 20 insertions, 5 deletions
diff --git a/libavformat/avio.h b/libavformat/avio.h index 3ed9175a9b..36c3d7b430 100644 --- a/libavformat/avio.h +++ b/libavformat/avio.h @@ -520,6 +520,12 @@ int64_t avio_size(AVIOContext *s); int avio_feof(AVIOContext *s); /** + * Writes a formatted string to the context taking a va_list. + * @return number of bytes written, < 0 on error. + */ +int avio_vprintf(AVIOContext *s, const char *fmt, va_list ap); + +/** * Writes a formatted string to the context. * @return number of bytes written, < 0 on error. */ diff --git a/libavformat/aviobuf.c b/libavformat/aviobuf.c index 33bc3c2e20..b20b1a611a 100644 --- a/libavformat/aviobuf.c +++ b/libavformat/aviobuf.c @@ -1292,15 +1292,12 @@ int avio_closep(AVIOContext **s) return ret; } -int avio_printf(AVIOContext *s, const char *fmt, ...) +int avio_vprintf(AVIOContext *s, const char *fmt, va_list ap) { - va_list ap; AVBPrint bp; av_bprint_init(&bp, 0, INT_MAX); - va_start(ap, fmt); av_vbprintf(&bp, fmt, ap); - va_end(ap); if (!av_bprint_is_complete(&bp)) { av_bprint_finalize(&bp, NULL); s->error = AVERROR(ENOMEM); @@ -1311,6 +1308,18 @@ int avio_printf(AVIOContext *s, const char *fmt, ...) return bp.len; } +int avio_printf(AVIOContext *s, const char *fmt, ...) +{ + va_list ap; + int ret; + + va_start(ap, fmt); + ret = avio_vprintf(s, fmt, ap); + va_end(ap); + + return ret; +} + void avio_print_string_array(AVIOContext *s, const char *strings[]) { for(; *strings; strings++) diff --git a/libavformat/version.h b/libavformat/version.h index 6c2776460b..966ebb7ed3 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -31,7 +31,7 @@ #include "version_major.h" -#define LIBAVFORMAT_VERSION_MINOR 24 +#define LIBAVFORMAT_VERSION_MINOR 25 #define LIBAVFORMAT_VERSION_MICRO 100 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ |