Module: libav Branch: release/11 Commit: 7a7b3858ef5f71a3c68dc6e7de889fd64b8f83dc
Author: Luca Barbato <[email protected]> Committer: Luca Barbato <[email protected]> Date: Fri Feb 19 13:49:43 2016 +0100 matroska: Always consider S_TEXT/UTF8 as SRT when demuxing Reported-By: Maxim Koitsov <[email protected]> --- libavformat/matroska.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/matroska.c b/libavformat/matroska.c index 237f26f..e6039d1 100644 --- a/libavformat/matroska.c +++ b/libavformat/matroska.c @@ -55,8 +55,8 @@ const CodecTags ff_mkv_codec_tags[]={ {"A_VORBIS" , AV_CODEC_ID_VORBIS}, {"A_WAVPACK4" , AV_CODEC_ID_WAVPACK}, - {"S_TEXT/UTF8" , AV_CODEC_ID_TEXT}, {"S_TEXT/UTF8" , AV_CODEC_ID_SRT}, + {"S_TEXT/UTF8" , AV_CODEC_ID_TEXT}, {"S_TEXT/ASCII" , AV_CODEC_ID_TEXT}, {"S_TEXT/ASS" , AV_CODEC_ID_SSA}, {"S_TEXT/SSA" , AV_CODEC_ID_SSA}, _______________________________________________ libav-commits mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-commits
