mirror of
https://github.com/xenia-project/FFmpeg.git
synced 2024-11-23 11:39:49 +00:00
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 Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
parent
dbd47b7990
commit
d79e0fe65c
@ -15,6 +15,10 @@ libavutil: 2017-10-21
|
|||||||
|
|
||||||
API changes, most recent first:
|
API changes, most recent first:
|
||||||
|
|
||||||
|
2021-03-10 - xxxxxxxxxx - lavc 58.130.100 - packet.h
|
||||||
|
Change AVBufferRef related AVPacket function and struct size
|
||||||
|
parameter and fields type to size_t at next major bump.
|
||||||
|
|
||||||
2021-03-10 - xxxxxxxxxx - lavu 56.68.100 - buffer.h frame.h
|
2021-03-10 - xxxxxxxxxx - lavu 56.68.100 - buffer.h frame.h
|
||||||
Change AVBufferRef and relevant AVFrame function and struct size
|
Change AVBufferRef and relevant AVFrame function and struct size
|
||||||
parameter and fields type to size_t at next major bump.
|
parameter and fields type to size_t at next major bump.
|
||||||
|
@ -330,12 +330,16 @@ int av_packet_add_side_data(AVPacket *pkt, enum AVPacketSideDataType type,
|
|||||||
|
|
||||||
|
|
||||||
uint8_t *av_packet_new_side_data(AVPacket *pkt, enum AVPacketSideDataType type,
|
uint8_t *av_packet_new_side_data(AVPacket *pkt, enum AVPacketSideDataType type,
|
||||||
int size)
|
buffer_size_t size)
|
||||||
{
|
{
|
||||||
int ret;
|
int ret;
|
||||||
uint8_t *data;
|
uint8_t *data;
|
||||||
|
|
||||||
|
#if FF_API_BUFFER_SIZE_T
|
||||||
if ((unsigned)size > INT_MAX - AV_INPUT_BUFFER_PADDING_SIZE)
|
if ((unsigned)size > INT_MAX - AV_INPUT_BUFFER_PADDING_SIZE)
|
||||||
|
#else
|
||||||
|
if (size > SIZE_MAX - AV_INPUT_BUFFER_PADDING_SIZE)
|
||||||
|
#endif
|
||||||
return NULL;
|
return NULL;
|
||||||
data = av_mallocz(size + AV_INPUT_BUFFER_PADDING_SIZE);
|
data = av_mallocz(size + AV_INPUT_BUFFER_PADDING_SIZE);
|
||||||
if (!data)
|
if (!data)
|
||||||
@ -351,7 +355,7 @@ uint8_t *av_packet_new_side_data(AVPacket *pkt, enum AVPacketSideDataType type,
|
|||||||
}
|
}
|
||||||
|
|
||||||
uint8_t *av_packet_get_side_data(const AVPacket *pkt, enum AVPacketSideDataType type,
|
uint8_t *av_packet_get_side_data(const AVPacket *pkt, enum AVPacketSideDataType type,
|
||||||
int *size)
|
buffer_size_t *size)
|
||||||
{
|
{
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
@ -554,7 +558,7 @@ int av_packet_unpack_dictionary(const uint8_t *data, int size, AVDictionary **di
|
|||||||
}
|
}
|
||||||
|
|
||||||
int av_packet_shrink_side_data(AVPacket *pkt, enum AVPacketSideDataType type,
|
int av_packet_shrink_side_data(AVPacket *pkt, enum AVPacketSideDataType type,
|
||||||
int size)
|
buffer_size_t size)
|
||||||
{
|
{
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
|
@ -305,7 +305,11 @@ enum AVPacketSideDataType {
|
|||||||
|
|
||||||
typedef struct AVPacketSideData {
|
typedef struct AVPacketSideData {
|
||||||
uint8_t *data;
|
uint8_t *data;
|
||||||
|
#if FF_API_BUFFER_SIZE_T
|
||||||
int size;
|
int size;
|
||||||
|
#else
|
||||||
|
size_t size;
|
||||||
|
#endif
|
||||||
enum AVPacketSideDataType type;
|
enum AVPacketSideDataType type;
|
||||||
} AVPacketSideData;
|
} AVPacketSideData;
|
||||||
|
|
||||||
@ -559,7 +563,11 @@ void av_free_packet(AVPacket *pkt);
|
|||||||
* @return pointer to fresh allocated data or NULL otherwise
|
* @return pointer to fresh allocated data or NULL otherwise
|
||||||
*/
|
*/
|
||||||
uint8_t* av_packet_new_side_data(AVPacket *pkt, enum AVPacketSideDataType type,
|
uint8_t* av_packet_new_side_data(AVPacket *pkt, enum AVPacketSideDataType type,
|
||||||
|
#if FF_API_BUFFER_SIZE_T
|
||||||
int size);
|
int size);
|
||||||
|
#else
|
||||||
|
size_t size);
|
||||||
|
#endif
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Wrap an existing array as a packet side data.
|
* Wrap an existing array as a packet side data.
|
||||||
@ -586,7 +594,11 @@ int av_packet_add_side_data(AVPacket *pkt, enum AVPacketSideDataType type,
|
|||||||
* @return 0 on success, < 0 on failure
|
* @return 0 on success, < 0 on failure
|
||||||
*/
|
*/
|
||||||
int av_packet_shrink_side_data(AVPacket *pkt, enum AVPacketSideDataType type,
|
int av_packet_shrink_side_data(AVPacket *pkt, enum AVPacketSideDataType type,
|
||||||
|
#if FF_API_BUFFER_SIZE_T
|
||||||
int size);
|
int size);
|
||||||
|
#else
|
||||||
|
size_t size);
|
||||||
|
#endif
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Get side information from packet.
|
* Get side information from packet.
|
||||||
@ -598,7 +610,11 @@ int av_packet_shrink_side_data(AVPacket *pkt, enum AVPacketSideDataType type,
|
|||||||
* @return pointer to data if present or NULL otherwise
|
* @return pointer to data if present or NULL otherwise
|
||||||
*/
|
*/
|
||||||
uint8_t* av_packet_get_side_data(const AVPacket *pkt, enum AVPacketSideDataType type,
|
uint8_t* av_packet_get_side_data(const AVPacket *pkt, enum AVPacketSideDataType type,
|
||||||
|
#if FF_API_BUFFER_SIZE_T
|
||||||
int *size);
|
int *size);
|
||||||
|
#else
|
||||||
|
size_t *size);
|
||||||
|
#endif
|
||||||
|
|
||||||
#if FF_API_MERGE_SD_API
|
#if FF_API_MERGE_SD_API
|
||||||
attribute_deprecated
|
attribute_deprecated
|
||||||
|
@ -28,7 +28,7 @@
|
|||||||
#include "libavutil/version.h"
|
#include "libavutil/version.h"
|
||||||
|
|
||||||
#define LIBAVCODEC_VERSION_MAJOR 58
|
#define LIBAVCODEC_VERSION_MAJOR 58
|
||||||
#define LIBAVCODEC_VERSION_MINOR 129
|
#define LIBAVCODEC_VERSION_MINOR 130
|
||||||
#define LIBAVCODEC_VERSION_MICRO 100
|
#define LIBAVCODEC_VERSION_MICRO 100
|
||||||
|
|
||||||
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
|
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
|
||||||
|
Loading…
Reference in New Issue
Block a user