Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com> Reveiwed-by: Nicolas George <nicolas.george@normalesup.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>tags/n2.1
| @@ -155,6 +155,24 @@ void av_bprint_chars(AVBPrint *buf, char c, unsigned n) | |||||
| av_bprint_grow(buf, n); | av_bprint_grow(buf, n); | ||||
| } | } | ||||
| void av_bprint_append_data(AVBPrint *buf, const char *data, unsigned size) | |||||
| { | |||||
| unsigned room, real_n; | |||||
| while (1) { | |||||
| room = av_bprint_room(buf); | |||||
| if (size < room) | |||||
| break; | |||||
| if (av_bprint_alloc(buf, size)) | |||||
| break; | |||||
| } | |||||
| if (room) { | |||||
| real_n = FFMIN(size, room - 1); | |||||
| memcpy(buf->str + buf->len, data, real_n); | |||||
| } | |||||
| av_bprint_grow(buf, size); | |||||
| } | |||||
| void av_bprint_strftime(AVBPrint *buf, const char *fmt, const struct tm *tm) | void av_bprint_strftime(AVBPrint *buf, const char *fmt, const struct tm *tm) | ||||
| { | { | ||||
| unsigned room; | unsigned room; | ||||
| @@ -133,6 +133,15 @@ void av_vbprintf(AVBPrint *buf, const char *fmt, va_list vl_arg); | |||||
| */ | */ | ||||
| void av_bprint_chars(AVBPrint *buf, char c, unsigned n); | void av_bprint_chars(AVBPrint *buf, char c, unsigned n); | ||||
| /** | |||||
| * Append data to a print buffer. | |||||
| * | |||||
| * param buf bprint buffer to use | |||||
| * param data pointer to data | |||||
| * param size size of data | |||||
| */ | |||||
| void av_bprint_append_data(AVBPrint *buf, const char *data, unsigned size); | |||||
| struct tm; | struct tm; | ||||
| /** | /** | ||||
| * Append a formatted date and time to a print buffer. | * Append a formatted date and time to a print buffer. | ||||
| @@ -75,7 +75,7 @@ | |||||
| */ | */ | ||||
| #define LIBAVUTIL_VERSION_MAJOR 52 | #define LIBAVUTIL_VERSION_MAJOR 52 | ||||
| #define LIBAVUTIL_VERSION_MINOR 42 | |||||
| #define LIBAVUTIL_VERSION_MINOR 43 | |||||
| #define LIBAVUTIL_VERSION_MICRO 100 | #define LIBAVUTIL_VERSION_MICRO 100 | ||||
| #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ | #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ | ||||