|
|
|
@ -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, |
|
|
|
|