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
d070d6f6
Commit
d070d6f6
authored
May 19, 2018
by
Marton Balint
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
avcodec/avcodec.h: add AV_CODEC_ID_TTML
Signed-off-by:
Marton Balint
<
cus@passwd.hu
>
parent
d48fb904
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
2 deletions
+11
-2
avcodec.h
libavcodec/avcodec.h
+1
-0
codec_desc.c
libavcodec/codec_desc.c
+8
-0
version.h
libavcodec/version.h
+2
-2
No files found.
libavcodec/avcodec.h
View file @
d070d6f6
...
...
@@ -665,6 +665,7 @@ enum AVCodecID {
AV_CODEC_ID_PJS
,
AV_CODEC_ID_ASS
,
AV_CODEC_ID_HDMV_TEXT_SUBTITLE
,
AV_CODEC_ID_TTML
,
/* other specific kind of codecs (generally used for attachments) */
AV_CODEC_ID_FIRST_UNKNOWN
=
0x18000
,
///< A dummy ID pointing at the start of various fake codecs.
...
...
libavcodec/codec_desc.c
View file @
d070d6f6
...
...
@@ -3047,6 +3047,14 @@ static const AVCodecDescriptor codec_descriptors[] = {
.
long_name
=
NULL_IF_CONFIG_SMALL
(
"HDMV Text subtitle"
),
.
props
=
AV_CODEC_PROP_TEXT_SUB
,
},
{
.
id
=
AV_CODEC_ID_TTML
,
.
type
=
AVMEDIA_TYPE_SUBTITLE
,
.
name
=
"ttml"
,
.
long_name
=
NULL_IF_CONFIG_SMALL
(
"Timed Text Markup Language"
),
.
props
=
AV_CODEC_PROP_TEXT_SUB
,
},
/* other kind of codecs and pseudo-codecs */
{
...
...
libavcodec/version.h
View file @
d070d6f6
...
...
@@ -28,8 +28,8 @@
#include "libavutil/version.h"
#define LIBAVCODEC_VERSION_MAJOR 58
#define LIBAVCODEC_VERSION_MINOR
19
#define LIBAVCODEC_VERSION_MICRO 10
5
#define LIBAVCODEC_VERSION_MINOR
20
#define LIBAVCODEC_VERSION_MICRO 10
0
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
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