diff options
| -rw-r--r-- | doc/APIchanges | 3 | ||||
| -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 | ||||
| -rw-r--r-- | libavformat/dump.c | 3 |
6 files changed, 15 insertions, 1 deletions
diff --git a/doc/APIchanges b/doc/APIchanges index 5bfb0a654e..8eeaec2028 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -15,6 +15,9 @@ libavutil: 2017-10-21 API changes, most recent first: +2020-03-10 - xxxxxxxxxx - lavc 58.75.100 - avcodec.h + Add AV_PKT_DATA_ICC_PROFILE. + 2020-02-21 - xxxxxxxxxx - lavc 58.73.101 - avcodec.h Add AV_CODEC_EXPORT_DATA_PRFT. 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, \ diff --git a/libavformat/dump.c b/libavformat/dump.c index 56814ff7d2..220f404d65 100644 --- a/libavformat/dump.c +++ b/libavformat/dump.c @@ -446,6 +446,9 @@ static void dump_sidedata(void *ctx, AVStream *st, const char *indent) case AV_PKT_DATA_CONTENT_LIGHT_LEVEL: dump_content_light_metadata(ctx, &sd); break; + case AV_PKT_DATA_ICC_PROFILE: + av_log(ctx, AV_LOG_INFO, "ICC Profile"); + break; default: av_log(ctx, AV_LOG_INFO, "unknown side data type %d (%d bytes)", sd.type, sd.size); |