Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
F
FFmpeg
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
libremedia
Tethys
FFmpeg
Commits
d070d6f6
Commit
d070d6f6
authored
6 years ago
by
Marton Balint
Browse files
Options
Downloads
Patches
Plain Diff
avcodec/avcodec.h: add AV_CODEC_ID_TTML
Signed-off-by:
Marton Balint
<
cus@passwd.hu
>
parent
d48fb904
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
libavcodec/avcodec.h
+1
-0
1 addition, 0 deletions
libavcodec/avcodec.h
libavcodec/codec_desc.c
+8
-0
8 additions, 0 deletions
libavcodec/codec_desc.c
libavcodec/version.h
+2
-2
2 additions, 2 deletions
libavcodec/version.h
with
11 additions
and
2 deletions
libavcodec/avcodec.h
+
1
−
0
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.
...
...
This diff is collapsed.
Click to expand it.
libavcodec/codec_desc.c
+
8
−
0
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 */
{
...
...
This diff is collapsed.
Click to expand it.
libavcodec/version.h
+
2
−
2
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, \
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment