RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-02-17 04:17:05 +00:00
Code Issues Projects Releases Wiki Activity

lavf/matroskaenc: List subtitle codecs with fake codec_tags to allow remuxing.

Browse Source 
Fixes remuxing of DVBSUB to mkv.
This commit is contained in:
Carl Eugen Hoyos 2015-03-24 00:04:43 +01:00
parent c5d0148c7e
commit b76df6efb6
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavformat/matroskaenc.c
View File

@ -2000,6 +2000,12 @@ static const AVCodecTag additional_video_tags[] = {
{ AV_CODEC_ID_NONE, 0xFFFFFFFF } { 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 OFFSET(x) offsetof(MatroskaMuxContext, x)
#define FLAGS AV_OPT_FLAG_ENCODING_PARAM #define FLAGS AV_OPT_FLAG_ENCODING_PARAM
static const AVOption options[] = { static const AVOption options[] = {
@ -2037,7 +2043,7 @@ AVOutputFormat ff_matroska_muxer = {
AVFMT_TS_NONSTRICT | AVFMT_ALLOW_FLUSH, AVFMT_TS_NONSTRICT | AVFMT_ALLOW_FLUSH,
.codec_tag = (const AVCodecTag* const []){ .codec_tag = (const AVCodecTag* const []){
ff_codec_bmp_tags, ff_codec_wav_tags, 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, .subtitle_codec = AV_CODEC_ID_ASS,
.query_codec = mkv_query_codec, .query_codec = mkv_query_codec,