summaryrefslogtreecommitdiff
path: root/libavutil
diff options
context:
space:
mode:
authorStefano Sabatini <stefasab@gmail.com>2016-03-20 15:59:47 +0100
committerStefano Sabatini <stefasab@gmail.com>2016-04-02 12:48:21 +0200
commite8a9b644107a16473a6f8d9ae5a02b8444e3796e (patch)
treede18380bf0055cc1d9505cd83b85934d423b9980 /libavutil
parentb4daa2c40fb77974af6814cc0baaeec6a7481101 (diff)
lavu/base64: add AV_BASE64_DECODE_SIZE() macro
This is consistent with the AV_BASE64_SIZE macro and avoids the literal use of constants in the code.
Diffstat (limited to 'libavutil')
-rw-r--r--libavutil/base64.h9
-rw-r--r--libavutil/version.h2
2 files changed, 8 insertions, 3 deletions
diff --git a/libavutil/base64.h b/libavutil/base64.h
index 514498eac8..2954c12d42 100644
--- a/libavutil/base64.h
+++ b/libavutil/base64.h
@@ -29,20 +29,25 @@
* @{
*/
-
/**
* Decode a base64-encoded string.
*
* @param out buffer for decoded data
* @param in null-terminated input string
* @param out_size size in bytes of the out buffer, must be at
- * least 3/4 of the length of in
+ * least 3/4 of the length of in, that is AV_BASE64_DECODE_SIZE(strlen(in))
* @return number of bytes written, or a negative value in case of
* invalid input
*/
int av_base64_decode(uint8_t *out, const char *in, int out_size);
/**
+ * Calculate the output size in bytes needed to decode a base64 string
+ * with length x to a data buffer.
+ */
+#define AV_BASE64_DECODE_SIZE(x) ((x) * 3LL / 4)
+
+/**
* Encode data to base64 and null-terminate.
*
* @param out buffer for encoded data
diff --git a/libavutil/version.h b/libavutil/version.h
index 53e74bc343..f1e9e4006a 100644
--- a/libavutil/version.h
+++ b/libavutil/version.h
@@ -64,7 +64,7 @@
*/
#define LIBAVUTIL_VERSION_MAJOR 55
-#define LIBAVUTIL_VERSION_MINOR 19
+#define LIBAVUTIL_VERSION_MINOR 20
#define LIBAVUTIL_VERSION_MICRO 100
#define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \