diff options
| author | Andreas Rheinhardt <andreas.rheinhardt@gmail.com> | 2021-03-18 04:33:28 +0100 |
|---|---|---|
| committer | Andreas Rheinhardt <andreas.rheinhardt@gmail.com> | 2021-03-19 04:19:53 +0100 |
| commit | e8c0bca6bd7900c5dac82fd79afce6cc771be578 (patch) | |
| tree | 2b7a037e7c834f714cceb1c22a0fc75b9498e35c | |
| parent | a46d7819051e0e8c61017e75a0389389ae810ca4 (diff) | |
avutil/adler32: Switch av_adler32_update() to size_t on bump
av_adler32_update() is used by av_hash_update() which will be switched
to size_t at the next bump. So it also has to be made to use size_t.
This is also necessary for framecrcenc.c, because the size of side data
will become a size_t, too.
Reviewed-by: James Almer <jamrial@gmail.com>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
| -rw-r--r-- | doc/APIchanges | 7 | ||||
| -rw-r--r-- | libavutil/adler32.c | 4 | ||||
| -rw-r--r-- | libavutil/adler32.h | 16 | ||||
| -rw-r--r-- | libavutil/version.h | 2 |
4 files changed, 26 insertions, 3 deletions
diff --git a/doc/APIchanges b/doc/APIchanges index 937ea70fbc..6e116dbc83 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -15,6 +15,13 @@ libavutil: 2017-10-21 API changes, most recent first: +2021-03-19 - xxxxxxxxxx - lavu 56.69.100 - adler32.h + Added a typedef for the type of the Adler-32 checksums + used by av_adler32_update(). It will be changed to uint32_t + at the next major bump. + The type of the parameter for the length of the input buffer + will also be changed to size_t at the next major bump. + 2021-03-19 - xxxxxxxxxx - lavf 58.75.100 - avformat.h AVChapter.id will be changed from int to int64_t on the next major version bump. diff --git a/libavutil/adler32.c b/libavutil/adler32.c index c87d5e261c..5ed5ff55a3 100644 --- a/libavutil/adler32.c +++ b/libavutil/adler32.c @@ -41,8 +41,12 @@ #define DO4(buf) DO1(buf); DO1(buf); DO1(buf); DO1(buf); #define DO16(buf) DO4(buf); DO4(buf); DO4(buf); DO4(buf); +#if FF_API_CRYPTO_SIZE_T unsigned long av_adler32_update(unsigned long adler, const uint8_t * buf, unsigned int len) +#else +AVAdler av_adler32_update(AVAdler adler, const uint8_t *buf, size_t len) +#endif { unsigned long s1 = adler & 0xffff; unsigned long s2 = adler >> 16; diff --git a/libavutil/adler32.h b/libavutil/adler32.h index a1f035b734..e7a8f83729 100644 --- a/libavutil/adler32.h +++ b/libavutil/adler32.h @@ -27,8 +27,10 @@ #ifndef AVUTIL_ADLER32_H #define AVUTIL_ADLER32_H +#include <stddef.h> #include <stdint.h> #include "attributes.h" +#include "version.h" /** * @defgroup lavu_adler32 Adler-32 @@ -38,6 +40,12 @@ * @{ */ +#if FF_API_CRYPTO_SIZE_T +typedef unsigned long AVAdler; +#else +typedef uint32_t AVAdler; +#endif + /** * Calculate the Adler32 checksum of a buffer. * @@ -50,8 +58,12 @@ * @param len size of input buffer * @return updated checksum */ -unsigned long av_adler32_update(unsigned long adler, const uint8_t *buf, - unsigned int len) av_pure; +AVAdler av_adler32_update(AVAdler adler, const uint8_t *buf, +#if FF_API_CRYPTO_SIZE_T + unsigned int len) av_pure; +#else + size_t len) av_pure; +#endif /** * @} diff --git a/libavutil/version.h b/libavutil/version.h index 9a290d57e7..f357f6165e 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -79,7 +79,7 @@ */ #define LIBAVUTIL_VERSION_MAJOR 56 -#define LIBAVUTIL_VERSION_MINOR 68 +#define LIBAVUTIL_VERSION_MINOR 69 #define LIBAVUTIL_VERSION_MICRO 100 #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ |