Skip to content

Commit a94dcd9

Browse files
committed
update
1 parent f79e481 commit a94dcd9

20 files changed

Lines changed: 101 additions & 13 deletions

File tree

reactivedrop/bin/avcodec-62.dll

19 KB
Binary file not shown.

reactivedrop/bin/avformat-62.dll

512 Bytes
Binary file not shown.

reactivedrop/bin/avutil-60.dll

1.5 KB
Binary file not shown.

src/game/client/videoservices/include/libavcodec/avcodec.h

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1923,6 +1923,13 @@ typedef struct AVCodecContext {
19231923
*/
19241924
AVFrameSideData **decoded_side_data;
19251925
int nb_decoded_side_data;
1926+
1927+
/**
1928+
* Indicates how the alpha channel of the video is represented.
1929+
* - encoding: Set by user
1930+
* - decoding: Set by libavcodec
1931+
*/
1932+
enum AVAlphaMode alpha_mode;
19261933
} AVCodecContext;
19271934

19281935
/**
@@ -2528,6 +2535,7 @@ enum AVCodecConfig {
25282535
AV_CODEC_CONFIG_CHANNEL_LAYOUT, ///< AVChannelLayout, terminated by {0}
25292536
AV_CODEC_CONFIG_COLOR_RANGE, ///< AVColorRange, terminated by AVCOL_RANGE_UNSPECIFIED
25302537
AV_CODEC_CONFIG_COLOR_SPACE, ///< AVColorSpace, terminated by AVCOL_SPC_UNSPECIFIED
2538+
AV_CODEC_CONFIG_ALPHA_MODE, ///< AVAlphaMode, terminated by AVALPHA_MODE_UNSPECIFIED
25312539
};
25322540

25332541
/**

src/game/client/videoservices/include/libavcodec/codec_par.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -212,6 +212,11 @@ typedef struct AVCodecParameters {
212212
* Audio only. Number of samples to skip after a discontinuity.
213213
*/
214214
int seek_preroll;
215+
216+
/**
217+
* Video with alpha channel only. Alpha channel handling
218+
*/
219+
enum AVAlphaMode alpha_mode;
215220
} AVCodecParameters;
216221

217222
/**

src/game/client/videoservices/include/libavcodec/exif.h

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -144,26 +144,29 @@ int32_t av_exif_get_tag_id(const char *name);
144144
int av_exif_set_entry(void *logctx, AVExifMetadata *ifd, uint16_t id, enum AVTiffDataType type,
145145
uint32_t count, const uint8_t *ifd_lead, uint32_t ifd_offset, const void *value);
146146

147+
/**
148+
* Also check subdirectories.
149+
*/
150+
#define AV_EXIF_FLAG_RECURSIVE (1 << 0)
151+
147152
/**
148153
* Get an entry with the tagged ID from the EXIF metadata struct. A pointer to the entry
149-
* will be written into *value. If the recursive flag is set to true, this function will check
150-
* subdirectories as well.
154+
* will be written into *value.
151155
*
152156
* If the entry was present and returned successfully, a positive number is returned.
153157
* If the entry was not found, *value is left untouched and zero is returned.
154158
* If an error occurred, a negative number is returned.
155159
*/
156-
int av_exif_get_entry(void *logctx, AVExifMetadata *ifd, uint16_t id, int recursive, AVExifEntry **value);
160+
int av_exif_get_entry(void *logctx, AVExifMetadata *ifd, uint16_t id, int flags, AVExifEntry **value);
157161

158162
/**
159-
* Remove an entry from the provided EXIF metadata struct. If the recursive flag is set
160-
* to true, then this function will check subdirectories as well.
163+
* Remove an entry from the provided EXIF metadata struct.
161164
*
162165
* If the entry was present and removed successfully, a positive number is returned.
163166
* If the entry was not found, zero is returned.
164167
* If an error occurred, a negative number is returned.
165168
*/
166-
int av_exif_remove_entry(void *logctx, AVExifMetadata *ifd, uint16_t id, int recursive);
169+
int av_exif_remove_entry(void *logctx, AVExifMetadata *ifd, uint16_t id, int flags);
167170

168171
/**
169172
* Decodes the EXIF data provided in the buffer and writes it into the

src/game/client/videoservices/include/libavcodec/packet.h

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -362,6 +362,12 @@ enum AVPacketSideDataType {
362362
*/
363363
AV_PKT_DATA_RTCP_SR,
364364

365+
/**
366+
* Extensible image file format metadata. The payload is a buffer containing
367+
* EXIF metadata, starting with either 49 49 2a 00, or 4d 4d 00 2a.
368+
*/
369+
AV_PKT_DATA_EXIF,
370+
365371
/**
366372
* The number of side data types.
367373
* This is not part of the public API/ABI in the sense that it may

src/game/client/videoservices/include/libavcodec/version.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929

3030
#include "version_major.h"
3131

32-
#define LIBAVCODEC_VERSION_MINOR 13
32+
#define LIBAVCODEC_VERSION_MINOR 15
3333
#define LIBAVCODEC_VERSION_MICRO 100
3434

3535
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \

src/game/client/videoservices/include/libavcodec/version_major.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@
4242
#define FF_API_V408_CODECID (LIBAVCODEC_VERSION_MAJOR < 63)
4343
#define FF_API_CODEC_PROPS (LIBAVCODEC_VERSION_MAJOR < 63)
4444
#define FF_API_EXR_GAMMA (LIBAVCODEC_VERSION_MAJOR < 63)
45-
#define FF_API_OLD_EXIF (LIBAVCODEC_VERSION_MAJOR < 63)
4645

4746
#define FF_API_NVDEC_OLD_PIX_FMTS (LIBAVCODEC_VERSION_MAJOR < 63)
4847

src/game/client/videoservices/include/libavformat/avformat.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2819,7 +2819,8 @@ void av_dump_format(AVFormatContext *ic,
28192819
int is_output);
28202820

28212821

2822-
#define AV_FRAME_FILENAME_FLAGS_MULTIPLE 1 ///< Allow multiple %d
2822+
#define AV_FRAME_FILENAME_FLAGS_MULTIPLE 1 ///< Allow multiple %d
2823+
#define AV_FRAME_FILENAME_FLAGS_IGNORE_TRUNCATION 2 ///< Ignore truncated output instead of returning an error
28232824

28242825
/**
28252826
* Return in 'buf' the path with '%d' replaced by a number.

0 commit comments

Comments
 (0)