Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
F
ffmpeg.wasm-core
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Linshizhi
ffmpeg.wasm-core
Commits
05d27f34
Commit
05d27f34
authored
Sep 23, 2019
by
vectronic
Committed by
Derek Buitenhuis
Mar 10, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
API: add AV_PKT_DATA_ICC_PROFILE to AVPacketSideDataType
Signed-off-by:
vectronic
<
hello.vectronic@gmail.com
>
parent
2847c5c6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
15 additions
and
1 deletion
+15
-1
APIchanges
doc/APIchanges
+3
-0
avcodec.h
libavcodec/avcodec.h
+6
-0
avpacket.c
libavcodec/avpacket.c
+1
-0
decode.c
libavcodec/decode.c
+1
-0
version.h
libavcodec/version.h
+1
-1
dump.c
libavformat/dump.c
+3
-0
No files found.
doc/APIchanges
View file @
05d27f34
...
...
@@ -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.
...
...
libavcodec/avcodec.h
View file @
05d27f34
...
...
@@ -1451,6 +1451,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
...
...
libavcodec/avpacket.c
View file @
05d27f34
...
...
@@ -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
;
}
...
...
libavcodec/decode.c
View file @
05d27f34
...
...
@@ -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
)
{
...
...
libavcodec/version.h
View file @
05d27f34
...
...
@@ -28,7 +28,7 @@
#include "libavutil/version.h"
#define LIBAVCODEC_VERSION_MAJOR 58
#define LIBAVCODEC_VERSION_MINOR 7
4
#define LIBAVCODEC_VERSION_MINOR 7
5
#define LIBAVCODEC_VERSION_MICRO 100
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
...
...
libavformat/dump.c
View file @
05d27f34
...
...
@@ -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
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment