diff options
| author | mosu <mosu@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2004-01-11 13:36:53 +0000 |
|---|---|---|
| committer | mosu <mosu@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2004-01-11 13:36:53 +0000 |
| commit | 9ce5d288f952870e6e5fd5e7bcab55dc47089915 (patch) | |
| tree | 842b98abe0b1c64f5c99eb35fc7d14bdbdfdafea /libmpdemux | |
| parent | 7d2f55730b0b3dda76f85d707f46eda4737aec9d (diff) | |
| download | mpv-9ce5d288f952870e6e5fd5e7bcab55dc47089915.tar.bz2 mpv-9ce5d288f952870e6e5fd5e7bcab55dc47089915.tar.xz | |
Added more legacy CodecIDs (S_ASS).
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11775 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux')
| -rw-r--r-- | libmpdemux/demux_mkv.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libmpdemux/demux_mkv.cpp b/libmpdemux/demux_mkv.cpp index 211be4f725..65512463c1 100644 --- a/libmpdemux/demux_mkv.cpp +++ b/libmpdemux/demux_mkv.cpp @@ -2461,6 +2461,7 @@ extern "C" int demux_mkv_open(demuxer_t *demuxer) { strcmp(track->codec_id, MKV_S_TEXTUTF8) && strcmp(track->codec_id, MKV_S_TEXTSSA) && strcmp(track->codec_id, "S_SSA") && + strcmp(track->codec_id, "S_ASS") && strcmp(track->codec_id, "S_TEXT/ASS")) mp_msg(MSGT_DEMUX, MSGL_ERR, "[mkv] Subtitle type '%s' is not " "supported. Track will not be displayed.\n", track->codec_id); @@ -2476,6 +2477,7 @@ extern "C" int demux_mkv_open(demuxer_t *demuxer) { sub_utf8 = 1; // Force UTF-8 conversion. if (!strcmp(track->codec_id, MKV_S_TEXTSSA) || !strcmp(track->codec_id, "S_SSA") || + !strcmp(track->codec_id, "S_ASS") || !strcmp(track->codec_id, "S_TEXT/ASS")) { mkv_d->subtitle_type = MKV_SUBTYPE_SSA; sub_utf8 = 1; |