Mercurial > mplayer.hg

comparison libmpdemux/demux_mkv.cpp @ 11268:c367751bd7cb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
10! someone please tell me how subs ever worked with mkv
author attila
date Sun, 26 Oct 2003 12:28:45 +0000
parents 1c269ab5f3f6
children ec45f2106ec6
comparison
equal deleted inserted replaced
11267:bce074f4263f 11268:c367751bd7cb
2355 mkv_d->subtitle_type = MKV_SUBTYPE_VOBSUB; 2355 mkv_d->subtitle_type = MKV_SUBTYPE_VOBSUB;
2356 demuxer->sub->sh = (mkv_sh_sub_t *)safememdup(&track->sh_sub, 2356 demuxer->sub->sh = (mkv_sh_sub_t *)safememdup(&track->sh_sub,
2357 sizeof(mkv_sh_sub_t)); 2357 sizeof(mkv_sh_sub_t));
2358 demuxer->sub->id = track->xid; 2358 demuxer->sub->id = track->xid;
2359 2359
2360 } else if (strcmp(track->codec_id, MKV_S_TEXTASCII) && 2360 } else if (!(strcmp(track->codec_id, MKV_S_TEXTASCII) &&
2361 strcmp(track->codec_id, MKV_S_TEXTUTF8) && 2361 strcmp(track->codec_id, MKV_S_TEXTUTF8) &&
2362 strcmp(track->codec_id, MKV_S_TEXTSSA) && 2362 strcmp(track->codec_id, MKV_S_TEXTSSA) &&
2363 strcmp(track->codec_id, "S_SSA")) 2363 strcmp(track->codec_id, "S_SSA")))
2364 mp_msg(MSGT_DEMUX, MSGL_ERR, "[mkv] Subtitle type '%s' is not " 2364 mp_msg(MSGT_DEMUX, MSGL_ERR, "[mkv] Subtitle type '%s' is not "
2365 "supported. Track will not be displayed.\n", track->codec_id); 2365 "supported. Track will not be displayed.\n", track->codec_id);
2366 else { 2366 else {
2367 mp_msg(MSGT_DEMUX, MSGL_INFO, "[mkv] Will display subtitle track %u\n", 2367 mp_msg(MSGT_DEMUX, MSGL_INFO, "[mkv] Will display subtitle track %u\n",
2368 track->tnum); 2368 track->tnum);