@@ -2053,8 +2053,13 @@ uint8_t *av_stream_new_side_data(AVStream *stream, | |||||
* @param size pointer for side information size to store (optional) | * @param size pointer for side information size to store (optional) | ||||
* @return pointer to data if present or NULL otherwise | * @return pointer to data if present or NULL otherwise | ||||
*/ | */ | ||||
#if FF_API_NOCONST_GET_SIDE_DATA | |||||
uint8_t *av_stream_get_side_data(AVStream *stream, | uint8_t *av_stream_get_side_data(AVStream *stream, | ||||
enum AVPacketSideDataType type, int *size); | enum AVPacketSideDataType type, int *size); | ||||
#else | |||||
uint8_t *av_stream_get_side_data(const AVStream *stream, | |||||
enum AVPacketSideDataType type, int *size); | |||||
#endif | |||||
AVProgram *av_new_program(AVFormatContext *s, int id); | AVProgram *av_new_program(AVFormatContext *s, int id); | ||||
@@ -5007,8 +5007,13 @@ int ff_generate_avci_extradata(AVStream *st) | |||||
return 0; | return 0; | ||||
} | } | ||||
uint8_t *av_stream_get_side_data(AVStream *st, enum AVPacketSideDataType type, | |||||
int *size) | |||||
#if FF_API_NOCONST_GET_SIDE_DATA | |||||
uint8_t *av_stream_get_side_data(AVStream *st, | |||||
enum AVPacketSideDataType type, int *size) | |||||
#else | |||||
uint8_t *av_stream_get_side_data(const AVStream *st, | |||||
enum AVPacketSideDataType type, int *size) | |||||
#endif | |||||
{ | { | ||||
int i; | int i; | ||||
@@ -32,8 +32,8 @@ | |||||
// Major bumping may affect Ticket5467, 5421, 5451(compatibility with Chromium) | // Major bumping may affect Ticket5467, 5421, 5451(compatibility with Chromium) | ||||
// Also please add any ticket numbers that you belive might be affected here | // Also please add any ticket numbers that you belive might be affected here | ||||
#define LIBAVFORMAT_VERSION_MAJOR 57 | #define LIBAVFORMAT_VERSION_MAJOR 57 | ||||
#define LIBAVFORMAT_VERSION_MINOR 46 | |||||
#define LIBAVFORMAT_VERSION_MICRO 101 | |||||
#define LIBAVFORMAT_VERSION_MINOR 47 | |||||
#define LIBAVFORMAT_VERSION_MICRO 100 | |||||
#define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ | #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ | ||||
LIBAVFORMAT_VERSION_MINOR, \ | LIBAVFORMAT_VERSION_MINOR, \ | ||||
@@ -79,6 +79,9 @@ | |||||
#ifndef FF_API_LAVF_AVCTX | #ifndef FF_API_LAVF_AVCTX | ||||
#define FF_API_LAVF_AVCTX (LIBAVFORMAT_VERSION_MAJOR < 58) | #define FF_API_LAVF_AVCTX (LIBAVFORMAT_VERSION_MAJOR < 58) | ||||
#endif | #endif | ||||
#ifndef FF_API_NOCONST_GET_SIDE_DATA | |||||
#define FF_API_NOCONST_GET_SIDE_DATA (LIBAVFORMAT_VERSION_MAJOR < 58) | |||||
#endif | |||||
#ifndef FF_API_R_FRAME_RATE | #ifndef FF_API_R_FRAME_RATE | ||||
#define FF_API_R_FRAME_RATE 1 | #define FF_API_R_FRAME_RATE 1 | ||||