Marton Balint (12019-08-05): > We do this by switching to AVBPrint. > > Signed-off-by: Marton Balint <[email protected]> > --- > doc/APIchanges | 3 +++ > libavformat/avio.h | 5 ++++- > libavformat/aviobuf.c | 15 ++++++++++----- > libavformat/version.h | 2 +- > 4 files changed, 18 insertions(+), 7 deletions(-) > > diff --git a/doc/APIchanges b/doc/APIchanges > index 0b19fb067d..fe36c34b90 100644 > --- a/doc/APIchanges > +++ b/doc/APIchanges > @@ -15,6 +15,9 @@ libavutil: 2017-10-21 > > API changes, most recent first: > > +2019-08-xx - xxxxxxxxxx - lavf 58.31.101 - avio.h > + 4K limit removed from avio_printf. > + > 2019-08-xx - xxxxxxxxxx - lavf 58.31.100 - avio.h > Add avio_print_n_strings and avio_print. > > diff --git a/libavformat/avio.h b/libavformat/avio.h > index ca08907917..f2051da18d 100644 > --- a/libavformat/avio.h > +++ b/libavformat/avio.h > @@ -571,7 +571,10 @@ int64_t avio_size(AVIOContext *s); > */ > int avio_feof(AVIOContext *s); > > -/** @warning Writes up to 4 KiB per call */ > +/** > + * Writes a formatted string to the context. > + * @return number of bytes written, < 0 on error. > + */ > int avio_printf(AVIOContext *s, const char *fmt, ...) av_printf_format(2, 3); > > /** > diff --git a/libavformat/aviobuf.c b/libavformat/aviobuf.c > index c37b056b64..007fba6410 100644 > --- a/libavformat/aviobuf.c > +++ b/libavformat/aviobuf.c > @@ -1215,14 +1215,19 @@ int avio_closep(AVIOContext **s) > int avio_printf(AVIOContext *s, const char *fmt, ...) > { > va_list ap; > - char buf[4096]; /* update doc entry in avio.h if changed */ > - int ret; > + AVBPrint bp; >
> + av_bprint_init(&bp, 0, INT_MAX);
INT_MAX? Should be -1 or AV_BPRINT_SIZE_UNLIMITED.
> va_start(ap, fmt);
> - ret = vsnprintf(buf, sizeof(buf), fmt, ap);
> + av_vbprintf(&bp, fmt, ap);
> va_end(ap);
> - avio_write(s, buf, strlen(buf));
> - return ret;
> + if (!av_bprint_is_complete(&bp)) {
> + av_bprint_finalize(&bp, NULL);
> + return AVERROR(ENOMEM);
> + }
> + avio_write(s, bp.str, bp.len);
> + av_bprint_finalize(&bp, NULL);
> + return bp.len;
> }
>
> int avio_print_n_strings(AVIOContext *s, int nb_strings, ...)
> diff --git a/libavformat/version.h b/libavformat/version.h
> index feceaedc08..9814db8633 100644
> --- a/libavformat/version.h
> +++ b/libavformat/version.h
> @@ -33,7 +33,7 @@
> // Also please add any ticket numbers that you believe might be affected here
> #define LIBAVFORMAT_VERSION_MAJOR 58
> #define LIBAVFORMAT_VERSION_MINOR 31
> -#define LIBAVFORMAT_VERSION_MICRO 100
> +#define LIBAVFORMAT_VERSION_MICRO 101
>
> #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
> LIBAVFORMAT_VERSION_MINOR, \
Regards,
--
Nicolas George
signature.asc
Description: PGP signature
_______________________________________________ ffmpeg-devel mailing list [email protected] https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email [email protected] with subject "unsubscribe".
