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
a7dd933b
Commit
a7dd933b
authored
May 03, 2015
by
Michael Niedermayer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
avcodec: Add av_packet_side_data_name()
Signed-off-by:
Michael Niedermayer
<
michaelni@gmx.at
>
parent
daea3209
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
30 additions
and
2 deletions
+30
-2
APIchanges
doc/APIchanges
+3
-0
avcodec.h
libavcodec/avcodec.h
+2
-0
avpacket.c
libavcodec/avpacket.c
+23
-0
version.h
libavcodec/version.h
+2
-2
No files found.
doc/APIchanges
View file @
a7dd933b
...
@@ -15,6 +15,9 @@ libavutil: 2014-08-09
...
@@ -15,6 +15,9 @@ libavutil: 2014-08-09
API changes, most recent first:
API changes, most recent first:
2015-05-07 - xxxxxxx - 56.38.100 - avcodec.h
Add av_packet_side_data_name().
2015-05-04 - xxxxxxx - 56.37.100 - avcodec.h
2015-05-04 - xxxxxxx - 56.37.100 - avcodec.h
Add FF_PROFILE_VP9_0 and FF_PROFILE_VP9_1.
Add FF_PROFILE_VP9_0 and FF_PROFILE_VP9_1.
...
...
libavcodec/avcodec.h
View file @
a7dd933b
...
@@ -3852,6 +3852,8 @@ int av_packet_merge_side_data(AVPacket *pkt);
...
@@ -3852,6 +3852,8 @@ int av_packet_merge_side_data(AVPacket *pkt);
int
av_packet_split_side_data
(
AVPacket
*
pkt
);
int
av_packet_split_side_data
(
AVPacket
*
pkt
);
const
char
*
av_packet_side_data_name
(
enum
AVPacketSideDataType
type
);
/**
/**
* Pack a dictionary for use in side_data.
* Pack a dictionary for use in side_data.
*
*
...
...
libavcodec/avpacket.c
View file @
a7dd933b
...
@@ -336,6 +336,29 @@ uint8_t *av_packet_get_side_data(AVPacket *pkt, enum AVPacketSideDataType type,
...
@@ -336,6 +336,29 @@ uint8_t *av_packet_get_side_data(AVPacket *pkt, enum AVPacketSideDataType type,
return
NULL
;
return
NULL
;
}
}
const
char
*
av_packet_side_data_name
(
enum
AVPacketSideDataType
type
)
{
switch
(
type
)
{
case
AV_PKT_DATA_PALETTE
:
return
"Palette"
;
case
AV_PKT_DATA_NEW_EXTRADATA
:
return
"New Extradata"
;
case
AV_PKT_DATA_PARAM_CHANGE
:
return
"Param Change"
;
case
AV_PKT_DATA_H263_MB_INFO
:
return
"H263 MB Info"
;
case
AV_PKT_DATA_REPLAYGAIN
:
return
"Replay Gain"
;
case
AV_PKT_DATA_DISPLAYMATRIX
:
return
"Display Matrix"
;
case
AV_PKT_DATA_STEREO3D
:
return
"Stereo 3D"
;
case
AV_PKT_DATA_AUDIO_SERVICE_TYPE
:
return
"Audio Service Type"
;
case
AV_PKT_DATA_SKIP_SAMPLES
:
return
"Skip Samples"
;
case
AV_PKT_DATA_JP_DUALMONO
:
return
"JP Dual Mono"
;
case
AV_PKT_DATA_STRINGS_METADATA
:
return
"Strings Metadata"
;
case
AV_PKT_DATA_SUBTITLE_POSITION
:
return
"Subtitle Position"
;
case
AV_PKT_DATA_MATROSKA_BLOCKADDITIONAL
:
return
"Matroska BlockAdditional"
;
case
AV_PKT_DATA_WEBVTT_IDENTIFIER
:
return
"WebVTT ID"
;
case
AV_PKT_DATA_WEBVTT_SETTINGS
:
return
"WebVTT Settings"
;
case
AV_PKT_DATA_METADATA_UPDATE
:
return
"Metadata Update"
;
}
return
NULL
;
}
#define FF_MERGE_MARKER 0x8c4d9d108e25e9feULL
#define FF_MERGE_MARKER 0x8c4d9d108e25e9feULL
int
av_packet_merge_side_data
(
AVPacket
*
pkt
){
int
av_packet_merge_side_data
(
AVPacket
*
pkt
){
...
...
libavcodec/version.h
View file @
a7dd933b
...
@@ -29,8 +29,8 @@
...
@@ -29,8 +29,8 @@
#include "libavutil/version.h"
#include "libavutil/version.h"
#define LIBAVCODEC_VERSION_MAJOR 56
#define LIBAVCODEC_VERSION_MAJOR 56
#define LIBAVCODEC_VERSION_MINOR 3
7
#define LIBAVCODEC_VERSION_MINOR 3
8
#define LIBAVCODEC_VERSION_MICRO 10
2
#define LIBAVCODEC_VERSION_MICRO 10
0
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
LIBAVCODEC_VERSION_MINOR, \
LIBAVCODEC_VERSION_MINOR, \
...
...
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