Mercurial > mplayer.hg

comparison libmpdemux/demux_mkv.cpp @ 10984:e5f2765c6d80

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Backwards compatibility fix for old SSA CodecIDs.
author mosu
date Thu, 02 Oct 2003 19:02:28 +0000
parents 624f11cc5034
children d8ddd7727084
comparison
equal deleted inserted replaced
10983:590355444f47 10984:e5f2765c6d80
1898 else if (dvdsub_lang != NULL) 1898 else if (dvdsub_lang != NULL)
1899 track = find_track_by_language(mkv_d, dvdsub_lang, NULL); 1899 track = find_track_by_language(mkv_d, dvdsub_lang, NULL);
1900 if (track) { 1900 if (track) {
1901 if (strcmp(track->codec_id, MKV_S_TEXTASCII) && 1901 if (strcmp(track->codec_id, MKV_S_TEXTASCII) &&
1902 strcmp(track->codec_id, MKV_S_TEXTUTF8) && 1902 strcmp(track->codec_id, MKV_S_TEXTUTF8) &&
1903 strcmp(track->codec_id, MKV_S_TEXTSSA)) 1903 strcmp(track->codec_id, MKV_S_TEXTSSA) &&
1904 strcmp(track->codec_id, "S_SSA"))
1904 mp_msg(MSGT_DEMUX, MSGL_ERR, "[mkv] Subtitle type '%s' is not " 1905 mp_msg(MSGT_DEMUX, MSGL_ERR, "[mkv] Subtitle type '%s' is not "
1905 "supported. Track will not be displayed.\n", track->codec_id); 1906 "supported. Track will not be displayed.\n", track->codec_id);
1906 else { 1907 else {
1907 mp_msg(MSGT_DEMUX, MSGL_INFO, "[mkv] Will display subtitle track %u\n", 1908 mp_msg(MSGT_DEMUX, MSGL_INFO, "[mkv] Will display subtitle track %u\n",
1908 track->tnum); 1909 track->tnum);
1911 for (i = 0; i < SUB_MAX_TEXT; i++) 1912 for (i = 0; i < SUB_MAX_TEXT; i++)
1912 mkv_d->subs.text[i] = (char *)malloc(256); 1913 mkv_d->subs.text[i] = (char *)malloc(256);
1913 1914
1914 if (!strcmp(track->codec_id, MKV_S_TEXTUTF8)) 1915 if (!strcmp(track->codec_id, MKV_S_TEXTUTF8))
1915 sub_utf8 = 1; // Force UTF-8 conversion. 1916 sub_utf8 = 1; // Force UTF-8 conversion.
1916 if (!strcmp(track->codec_id, MKV_S_TEXTSSA)) { 1917 if (!strcmp(track->codec_id, MKV_S_TEXTSSA) ||
1918 !strcmp(track->codec_id, "S_SSA")) {
1917 mkv_d->subtitle_type = MKV_SUBTYPE_SSA; 1919 mkv_d->subtitle_type = MKV_SUBTYPE_SSA;
1918 sub_utf8 = 1; 1920 sub_utf8 = 1;
1919 } else 1921 } else
1920 mkv_d->subtitle_type = MKV_SUBTYPE_TEXT; 1922 mkv_d->subtitle_type = MKV_SUBTYPE_TEXT;
1921 } else 1923 } else