diff options
| author | vectronic <hello.vectronic@gmail.com> | 2019-09-23 21:43:02 +0100 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2020-03-10 15:10:06 +0000 |
| commit | 05d27f342be28cf92f3c9470e701834c416cad89 (patch) | |
| tree | de138fced37deeb9208430847001595b07f1cbae /libavcodec | |
| parent | 2847c5c6f93b00c0ec9fb82dba7c382faf7335cc (diff) | |
| download | ffmpeg-05d27f342be28cf92f3c9470e701834c416cad89.tar.gz | |
API: add AV_PKT_DATA_ICC_PROFILE to AVPacketSideDataType
Signed-off-by: vectronic <hello.vectronic@gmail.com>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/avcodec.h | 6 | ||||
| -rw-r--r-- | libavcodec/avpacket.c | 1 | ||||
| -rw-r--r-- | libavcodec/decode.c | 1 | ||||
| -rw-r--r-- | libavcodec/version.h | 2 |
4 files changed, 9 insertions, 1 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 833642d692..aca3825fd3 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -1452,6 +1452,12 @@ enum AVPacketSideDataType { AV_PKT_DATA_PRFT, /** + * ICC profile data consisting of an opaque octet buffer following the + * format described by ISO 15076-1. + */ + AV_PKT_DATA_ICC_PROFILE, + + /** * The number of side data types. * This is not part of the public API/ABI in the sense that it may * change when new side data types are added. diff --git a/libavcodec/avpacket.c b/libavcodec/avpacket.c index 74845efcd2..b5667659fd 100644 --- a/libavcodec/avpacket.c +++ b/libavcodec/avpacket.c @@ -394,6 +394,7 @@ const char *av_packet_side_data_name(enum AVPacketSideDataType type) case AV_PKT_DATA_ENCRYPTION_INIT_INFO: return "Encryption initialization data"; case AV_PKT_DATA_ENCRYPTION_INFO: return "Encryption info"; case AV_PKT_DATA_AFD: return "Active Format Description data"; + case AV_PKT_DATA_ICC_PROFILE: return "ICC Profile"; } return NULL; } diff --git a/libavcodec/decode.c b/libavcodec/decode.c index 03b9da25f9..07b64b387b 100644 --- a/libavcodec/decode.c +++ b/libavcodec/decode.c @@ -1750,6 +1750,7 @@ int ff_decode_frame_props(AVCodecContext *avctx, AVFrame *frame) { AV_PKT_DATA_MASTERING_DISPLAY_METADATA, AV_FRAME_DATA_MASTERING_DISPLAY_METADATA }, { AV_PKT_DATA_CONTENT_LIGHT_LEVEL, AV_FRAME_DATA_CONTENT_LIGHT_LEVEL }, { AV_PKT_DATA_A53_CC, AV_FRAME_DATA_A53_CC }, + { AV_PKT_DATA_ICC_PROFILE, AV_FRAME_DATA_ICC_PROFILE }, }; if (pkt) { diff --git a/libavcodec/version.h b/libavcodec/version.h index c051ac0754..a94ed92668 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -28,7 +28,7 @@ #include "libavutil/version.h" #define LIBAVCODEC_VERSION_MAJOR 58 -#define LIBAVCODEC_VERSION_MINOR 74 +#define LIBAVCODEC_VERSION_MINOR 75 #define LIBAVCODEC_VERSION_MICRO 100 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ |