diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-24 12:47:13 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-24 12:47:18 +0100 |
| commit | 4a6096e48134b5e6db4ec1f2af9ad2278219186a (patch) | |
| tree | ae621534b2dcc19716dd30c87a8367265ce58d5c | |
| parent | d66ca43fc1f62f057d43140e7a5905390739bfc7 (diff) | |
| parent | b76df6efb6816901796dd76439382baa43b50ef6 (diff) | |
| download | ffmpeg-4a6096e48134b5e6db4ec1f2af9ad2278219186a.tar.gz | |
Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master:
lavf/matroskaenc: List subtitle codecs with fake codec_tags to allow remuxing.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -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, |