Attachment #6797 for bug #32382

View | Details | Raw Unified | Return to bug 32382
Collapse All | Expand All

Lines 454-459 enum AVCodecID { Link Here

(-)libav-11.6/libavcodec/avcodec.h.orig (+1 lines)
454	AV_CODEC_ID_DVD_SUBTITLE = 0x17000,	454	AV_CODEC_ID_DVD_SUBTITLE = 0x17000,
455	AV_CODEC_ID_DVB_SUBTITLE,	455	AV_CODEC_ID_DVB_SUBTITLE,
456	AV_CODEC_ID_TEXT, ///< raw UTF-8 text	456	AV_CODEC_ID_TEXT, ///< raw UTF-8 text
		457	AV_CODEC_ID_SUBRIP, ///< raw UTF-8 text
457	AV_CODEC_ID_XSUB,	458	AV_CODEC_ID_XSUB,
458	AV_CODEC_ID_SSA,	459	AV_CODEC_ID_SSA,
459	AV_CODEC_ID_MOV_TEXT,	460	AV_CODEC_ID_MOV_TEXT,

Lines 2313-2318 static const AVCodecDescriptor codec_des Link Here

(-)libav-11.6/libavcodec/codec_desc.c.orig (+6 lines)
2313	.long_name = NULL_IF_CONFIG_SMALL("raw UTF-8 text"),	2313	.long_name = NULL_IF_CONFIG_SMALL("raw UTF-8 text"),
2314	},	2314	},
2315	{	2315	{
		2316	.id = AV_CODEC_ID_SUBRIP,
		2317	.type = AVMEDIA_TYPE_SUBTITLE,
		2318	.name = "text",
		2319	.long_name = NULL_IF_CONFIG_SMALL("raw UTF-8 text"),
		2320	},
		2321	{
2316	.id = AV_CODEC_ID_XSUB,	2322	.id = AV_CODEC_ID_XSUB,
2317	.type = AVMEDIA_TYPE_SUBTITLE,	2323	.type = AVMEDIA_TYPE_SUBTITLE,
2318	.name = "xsub",	2324	.name = "xsub",

Lines 56-61 const CodecTags ff_mkv_codec_tags[]={ Link Here

(-)libav-11.6/libavformat/matroska.c.orig (+1 lines)
56	{"A_WAVPACK4" , AV_CODEC_ID_WAVPACK},	56	{"A_WAVPACK4" , AV_CODEC_ID_WAVPACK},
57		57
58	{"S_TEXT/UTF8" , AV_CODEC_ID_SRT},	58	{"S_TEXT/UTF8" , AV_CODEC_ID_SRT},
		59	{"S_TEXT/UTF8" , AV_CODEC_ID_SUBRIP},
59	{"S_TEXT/UTF8" , AV_CODEC_ID_TEXT},	60	{"S_TEXT/UTF8" , AV_CODEC_ID_TEXT},
60	{"S_TEXT/ASCII" , AV_CODEC_ID_TEXT},	61	{"S_TEXT/ASCII" , AV_CODEC_ID_TEXT},
61	{"S_TEXT/ASS" , AV_CODEC_ID_SSA},	62	{"S_TEXT/ASS" , AV_CODEC_ID_SSA},

Lines 2293-2299 static int matroska_parse_frame(Matroska Link Here

(-)libav-11.6/libavformat/matroskadec.c.orig (-1 / +1 lines)
2293	else	2293	else
2294	pkt->pts = timecode;	2294	pkt->pts = timecode;
2295	pkt->pos = pos;	2295	pkt->pos = pos;
2296	if (st->codec->codec_id == AV_CODEC_ID_TEXT)	2296	if (st->codec->codec_id == AV_CODEC_ID_SUBRIP)
2297	pkt->convergence_duration = duration;	2297	pkt->convergence_duration = duration;
2298	else if (track->type != MATROSKA_TRACK_TYPE_SUBTITLE)	2298	else if (track->type != MATROSKA_TRACK_TYPE_SUBTITLE)
2299	pkt->duration = duration;	2299	pkt->duration = duration;

Return to bug 32382