diff options
| author | mosu <mosu@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-10-02 19:02:28 +0000 |
|---|---|---|
| committer | mosu <mosu@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-10-02 19:02:28 +0000 |
| commit | e6a5c8442bcc3116ccfe02c194a85b029701175f (patch) | |
| tree | 1c18d0372bd272839e1cd389b8c86a831895b1e3 /libmpdemux/demux_mkv.cpp | |
| parent | 50c7c4bb2006a41e972f8d5d24c56d5876ccee63 (diff) | |
| download | mpv-e6a5c8442bcc3116ccfe02c194a85b029701175f.tar.bz2 mpv-e6a5c8442bcc3116ccfe02c194a85b029701175f.tar.xz | |
Backwards compatibility fix for old SSA CodecIDs.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10985 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux/demux_mkv.cpp')
| -rw-r--r-- | libmpdemux/demux_mkv.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libmpdemux/demux_mkv.cpp b/libmpdemux/demux_mkv.cpp index 8674637ac2..cd77c763e6 100644 --- a/libmpdemux/demux_mkv.cpp +++ b/libmpdemux/demux_mkv.cpp @@ -1900,7 +1900,8 @@ extern "C" int demux_mkv_open(demuxer_t *demuxer) { if (track) { if (strcmp(track->codec_id, MKV_S_TEXTASCII) && strcmp(track->codec_id, MKV_S_TEXTUTF8) && - strcmp(track->codec_id, MKV_S_TEXTSSA)) + strcmp(track->codec_id, MKV_S_TEXTSSA) && + strcmp(track->codec_id, "S_SSA")) mp_msg(MSGT_DEMUX, MSGL_ERR, "[mkv] Subtitle type '%s' is not " "supported. Track will not be displayed.\n", track->codec_id); else { @@ -1913,7 +1914,8 @@ extern "C" int demux_mkv_open(demuxer_t *demuxer) { if (!strcmp(track->codec_id, MKV_S_TEXTUTF8)) sub_utf8 = 1; // Force UTF-8 conversion. - if (!strcmp(track->codec_id, MKV_S_TEXTSSA)) { + if (!strcmp(track->codec_id, MKV_S_TEXTSSA) || + !strcmp(track->codec_id, "S_SSA")) { mkv_d->subtitle_type = MKV_SUBTYPE_SSA; sub_utf8 = 1; } else |