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
b76df6ef
Commit
b76df6ef
authored
Mar 23, 2015
by
Carl Eugen Hoyos
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lavf/matroskaenc: List subtitle codecs with fake codec_tags to allow remuxing.
Fixes remuxing of DVBSUB to mkv.
parent
c5d0148c
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
1 deletion
+7
-1
matroskaenc.c
libavformat/matroskaenc.c
+7
-1
No files found.
libavformat/matroskaenc.c
View file @
b76df6ef
...
...
@@ -2000,6 +2000,12 @@ static const AVCodecTag additional_video_tags[] = {
{
AV_CODEC_ID_NONE
,
0xFFFFFFFF
}
};
static
const
AVCodecTag
additional_subtitle_tags
[]
=
{
{
AV_CODEC_ID_DVB_SUBTITLE
,
0xFFFFFFFF
},
{
AV_CODEC_ID_HDMV_PGS_SUBTITLE
,
0xFFFFFFFF
},
{
AV_CODEC_ID_NONE
,
0xFFFFFFFF
}
};
#define OFFSET(x) offsetof(MatroskaMuxContext, x)
#define FLAGS AV_OPT_FLAG_ENCODING_PARAM
static
const
AVOption
options
[]
=
{
...
...
@@ -2037,7 +2043,7 @@ AVOutputFormat ff_matroska_muxer = {
AVFMT_TS_NONSTRICT
|
AVFMT_ALLOW_FLUSH
,
.
codec_tag
=
(
const
AVCodecTag
*
const
[]){
ff_codec_bmp_tags
,
ff_codec_wav_tags
,
additional_audio_tags
,
additional_video_tags
,
0
additional_audio_tags
,
additional_video_tags
,
additional_subtitle_tags
,
0
},
.
subtitle_codec
=
AV_CODEC_ID_ASS
,
.
query_codec
=
mkv_query_codec
,
...
...
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