avcodec/packet: change side data related public function and struct size types to size_t

av_packet_add_side_data() already defines size as a size_t, so this makes it consistent across all side data functions

James Almer committed 5 years ago

Commit d79e0fe1 parent dbd47b74 files · +28 −4Browse files

Unified · Split

4 files

@@ -15,6 +15,10 @@ libavutil: 2017-10-21 · 14 unmodified lines
15		15
16	API changes, most recent first:	16	API changes, most recent first:
17		17
		18	2021-03-10 - xxxxxxxxxx - lavc 58.130.100 - packet.h
		19	Change AVBufferRef related AVPacket function and struct size
		20	parameter and fields type to size_t at next major bump.
		21
18	2021-03-10 - xxxxxxxxxx - lavu 56.68.100 - buffer.h frame.h	22	2021-03-10 - xxxxxxxxxx - lavu 56.68.100 - buffer.h frame.h
19	Change AVBufferRef and relevant AVFrame function and struct size	23	Change AVBufferRef and relevant AVFrame function and struct size
20	parameter and fields type to size_t at next major bump.	24	parameter and fields type to size_t at next major bump.

 uint8_t *av_packet_new_side_data(AVPacket *pkt, enum AVPacketSideDataType type,
-                                 int size)
+                                 buffer_size_t size)
 {
     int ret;
     uint8_t *data;
+#if FF_API_BUFFER_SIZE_T
     if ((unsigned)size > INT_MAX - AV_INPUT_BUFFER_PADDING_SIZE)
+#else
+    if (size > SIZE_MAX - AV_INPUT_BUFFER_PADDING_SIZE)
+#endif
         return NULL;
     data = av_mallocz(size + AV_INPUT_BUFFER_PADDING_SIZE);
     if (!data)
 }
 uint8_t *av_packet_get_side_data(const AVPacket *pkt, enum AVPacketSideDataType type,
-                                 int *size)
+                                 buffer_size_t *size)
 {
     int i;
 }
 int av_packet_shrink_side_data(AVPacket *pkt, enum AVPacketSideDataType type,
-                               int size)
+                               buffer_size_t size)
 {
     int i;

 typedef struct AVPacketSideData {
     uint8_t *data;
+#if FF_API_BUFFER_SIZE_T
     int      size;
+#else
+    size_t   size;
+#endif
     enum AVPacketSideDataType type;
 } AVPacketSideData;
  * @return pointer to fresh allocated data or NULL otherwise
  */
 uint8_t* av_packet_new_side_data(AVPacket *pkt, enum AVPacketSideDataType type,
+#if FF_API_BUFFER_SIZE_T
                                  int size);
+#else
+                                 size_t size);
+#endif
 /**
  * Wrap an existing array as a packet side data.
  * @return 0 on success, < 0 on failure
  */
 int av_packet_shrink_side_data(AVPacket *pkt, enum AVPacketSideDataType type,
+#if FF_API_BUFFER_SIZE_T
                                int size);
+#else
+                               size_t size);
+#endif
 /**
  * Get side information from packet.
  * @return pointer to data if present or NULL otherwise
  */
 uint8_t* av_packet_get_side_data(const AVPacket *pkt, enum AVPacketSideDataType type,
+#if FF_API_BUFFER_SIZE_T
                                  int *size);
+#else
+                                 size_t *size);
+#endif
 #if FF_API_MERGE_SD_API
 attribute_deprecated

@@ -28,7 +28,7 @@ · 27 unmodified lines
28	#include "libavutil/version.h"	28	#include "libavutil/version.h"
29		29
30	#define LIBAVCODEC_VERSION_MAJOR 58	30	#define LIBAVCODEC_VERSION_MAJOR 58
31	#define LIBAVCODEC_VERSION_MINOR 129	31	#define LIBAVCODEC_VERSION_MINOR 130
32	#define LIBAVCODEC_VERSION_MICRO 100	32	#define LIBAVCODEC_VERSION_MICRO 100
33		33
34	#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \	34	#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \

Keyboard shortcuts