diff options
| author | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2015-03-24 00:04:43 +0100 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2015-03-24 10:07:18 +0100 |
| commit | b76df6efb6816901796dd76439382baa43b50ef6 (patch) | |
| tree | b9eecb19f2f29d7493cda744e42a91b166aba4ba /libavformat | |
| parent | c5d0148c7e6d5ded4970d843ae6ef5864958e701 (diff) | |
| download | ffmpeg-b76df6efb6816901796dd76439382baa43b50ef6.tar.gz | |
lavf/matroskaenc: List subtitle codecs with fake codec_tags to allow remuxing.
Fixes remuxing of DVBSUB to mkv.
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/matroskaenc.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index 40f903b68f..6b2e390e90 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -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, |