ffmpeg | branch: release/2.6 | Carl Eugen Hoyos <ceho...@ag.or.at> | Tue Mar 24 00:04:43 2015 +0100| [b5a942685fee5417f02dd68510f433e9d7115acd] | committer: Michael Niedermayer
lavf/matroskaenc: List subtitle codecs with fake codec_tags to allow remuxing. Fixes remuxing of DVBSUB to mkv. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b5a942685fee5417f02dd68510f433e9d7115acd --- libavformat/matroskaenc.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index 1dfc5a8..66b4555 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -2006,6 +2006,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[] = { @@ -2043,7 +2049,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, _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
