Browse Source

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>
tags/n4.4
Andreas Rheinhardt 4 years ago
parent
commit
e8c0bca6bd
4 changed files with 26 additions and 3 deletions
  1. +7
    -0
      doc/APIchanges
  2. +4
    -0
      libavutil/adler32.c
  3. +14
    -2
      libavutil/adler32.h
  4. +1
    -1
      libavutil/version.h

+ 7
- 0
doc/APIchanges View File

@@ -15,6 +15,13 @@ libavutil: 2017-10-21


API changes, most recent first: 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 2021-03-19 - xxxxxxxxxx - lavf 58.75.100 - avformat.h
AVChapter.id will be changed from int to int64_t AVChapter.id will be changed from int to int64_t
on the next major version bump. on the next major version bump.


+ 4
- 0
libavutil/adler32.c View File

@@ -41,8 +41,12 @@
#define DO4(buf) DO1(buf); DO1(buf); DO1(buf); DO1(buf); #define DO4(buf) DO1(buf); DO1(buf); DO1(buf); DO1(buf);
#define DO16(buf) DO4(buf); DO4(buf); DO4(buf); DO4(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 long av_adler32_update(unsigned long adler, const uint8_t * buf,
unsigned int len) 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 s1 = adler & 0xffff;
unsigned long s2 = adler >> 16; unsigned long s2 = adler >> 16;


+ 14
- 2
libavutil/adler32.h View File

@@ -27,8 +27,10 @@
#ifndef AVUTIL_ADLER32_H #ifndef AVUTIL_ADLER32_H
#define AVUTIL_ADLER32_H #define AVUTIL_ADLER32_H


#include <stddef.h>
#include <stdint.h> #include <stdint.h>
#include "attributes.h" #include "attributes.h"
#include "version.h"


/** /**
* @defgroup lavu_adler32 Adler-32 * @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. * Calculate the Adler32 checksum of a buffer.
* *
@@ -50,8 +58,12 @@
* @param len size of input buffer * @param len size of input buffer
* @return updated checksum * @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


/** /**
* @} * @}


+ 1
- 1
libavutil/version.h View File

@@ -79,7 +79,7 @@
*/ */


#define LIBAVUTIL_VERSION_MAJOR 56 #define LIBAVUTIL_VERSION_MAJOR 56
#define LIBAVUTIL_VERSION_MINOR 68
#define LIBAVUTIL_VERSION_MINOR 69
#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, \


Loading…
Cancel
Save