diff options
| author | Luca Barbato <lu_zero@gentoo.org> | 2016-02-19 13:49:43 +0100 |
|---|---|---|
| committer | Luca Barbato <lu_zero@gentoo.org> | 2016-02-22 09:40:16 +0100 |
| commit | bf7be043fcfda29c81ef2268885b4ccc643e7c49 (patch) | |
| tree | e7debd3607e9b83d454fd68165a6b5f5057f6055 /libavformat | |
| parent | 8caadfc53ddc55a269722ada65294f0ea8b609ac (diff) | |
| download | ffmpeg-bf7be043fcfda29c81ef2268885b4ccc643e7c49.tar.gz | |
matroska: Always consider S_TEXT/UTF8 as SRT when demuxing
Reported-By: Maxim Koitsov <maksbotan@gentoo.org>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/matroska.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/matroska.c b/libavformat/matroska.c index eca1e41f75..a57b9637ce 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}, |