Download-Tools/mkvtoolnix
1
0
Fork 0
mirror of https://gitlab.com/mbunkus/mkvtoolnix.git synced 2024-12-24 20:01:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Re-activated VobSub support.

Browse Source
This commit is contained in:
Moritz Bunkus 2003-10-17 09:49:24 +00:00
parent f594f289cf
commit d2927e24d4
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/mkvmerge.cpp
View File

@ -223,7 +223,7 @@ file_type_t file_types[] =
{"rm ", TYPEREAL, "RealMedia audio and video"},
{"srt", TYPESRT, "SRT text subtitles"},
{"ssa", TYPESSA, "SSA/ASS text subtitles"},
// {"idx", TYPEVOBSUB, "VobSub subtitles"},
{"idx", TYPEVOBSUB, "VobSub subtitles"},
{"wav", TYPEWAV, "WAVE (uncompressed PCM)"},
{"output modules:", -1, ""},
{" ", -1, "AAC audio"},
@ -321,10 +321,10 @@ static void usage() {
" --sub-charset <TID:charset>\n"
" Sets the charset the text subtitles are\n"
" written in for the conversion to UTF-8.\n"
// "\n Options that only apply to VobSub subtitle tracks:\n"
// " --compression <TID:method>\n"
// " Sets the compression method used for the\n"
// " specified track ('none' or 'zlib').\n"
"\n Options that only apply to VobSub subtitle tracks:\n"
" --compression <TID:method>\n"
" Sets the compression method used for the\n"
" specified track ('none' or 'zlib').\n"
"\n\n Other options:\n"
" -i, --identify <file> Print information about the source file.\n"
" -l, --list-types Lists supported input file types.\n"
@ -397,8 +397,8 @@ static int get_type(char *filename) {
type = TYPESRT;
else if (ssa_reader_c::probe_file(mm_text_io, size))
type = TYPESSA;
// else if (vobsub_reader_c::probe_file(mm_text_io, size))
// type = TYPEVOBSUB;
else if (vobsub_reader_c::probe_file(mm_text_io, size))
type = TYPEVOBSUB;
else
type = TYPEUNKNOWN;
@ -1011,9 +1011,9 @@ static void create_readers() {
case TYPESSA:
file->reader = new ssa_reader_c(file->ti);
break;
// case TYPEVOBSUB:
// file->reader = new vobsub_reader_c(file->ti);
// break;
case TYPEVOBSUB:
file->reader = new vobsub_reader_c(file->ti);
break;
case TYPEQTMP4:
file->reader = new qtmp4_reader_c(file->ti);
break;