diff options
| author | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2009-09-28 11:32:27 +0000 |
|---|---|---|
| committer | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2009-09-28 11:32:27 +0000 |
| commit | e3625bd232a27113c4f6d1e68815da94630ba29c (patch) | |
| tree | 61a21c00b3c0988e83393a7992ec6525b5b13a95 | |
| parent | 76cc7886d8cd484daed0e444fd150db01f0f7c0a (diff) | |
| download | mpv-e3625bd232a27113c4f6d1e68815da94630ba29c.tar.bz2 mpv-e3625bd232a27113c4f6d1e68815da94630ba29c.tar.xz | |
Add a -nosub option that allows disabling auto-selected subtitles as e.g. the
mkv demuxer supports.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29730 b3059339-0415-0410-9bf9-f77b7e298cf2
| -rw-r--r-- | cfg-common-opts.h | 1 | ||||
| -rw-r--r-- | mencoder.c | 6 | ||||
| -rw-r--r-- | mplayer.c | 8 |
3 files changed, 8 insertions, 7 deletions
diff --git a/cfg-common-opts.h b/cfg-common-opts.h index 66fd8579aa..ff15f2c71d 100644 --- a/cfg-common-opts.h +++ b/cfg-common-opts.h @@ -132,6 +132,7 @@ {"ausid", &audio_substream_id, CONF_TYPE_INT, 0, 0, 0, NULL}, {"vid", &video_id, CONF_TYPE_INT, CONF_RANGE, -2, 8190, NULL}, {"sid", &dvdsub_id, CONF_TYPE_INT, CONF_RANGE, -2, 8190, NULL}, + {"nosub", &dvdsub_id, CONF_TYPE_FLAG, 0, -1, -2, NULL}, {"novideo", &video_id, CONF_TYPE_FLAG, 0, -1, -2, NULL}, { "hr-mp3-seek", &hr_mp3_seek, CONF_TYPE_FLAG, 0, 0, 1, NULL }, diff --git a/mencoder.c b/mencoder.c index b17e2be6a8..7e58e6a7b3 100644 --- a/mencoder.c +++ b/mencoder.c @@ -101,7 +101,7 @@ float stream_cache_seek_min_percent=50.0; int audio_id=-1; int video_id=-1; -int dvdsub_id=-2; +int dvdsub_id=-1; int vobsub_id=-1; char* audio_lang=NULL; char* dvdsub_lang=NULL; @@ -554,10 +554,10 @@ if(stream->type==STREAMTYPE_DVDNAV){ select_audio(demuxer, audio_id, audio_lang); - if (dvdsub_id < 0 && dvdsub_lang) + if (dvdsub_id == -1 && dvdsub_lang) dvdsub_id = demuxer_sub_track_by_lang(demuxer, dvdsub_lang); - if (dvdsub_id < 0) + if (dvdsub_id == -1) dvdsub_id = demuxer_default_sub_track(demuxer); for (i = 0; i < MAX_S_STREAMS; i++) { @@ -253,7 +253,7 @@ extern char *sub_demuxer_name; // override sub demuxer // streaming: int audio_id=-1; int video_id=-1; -int dvdsub_id=-2; +int dvdsub_id=-1; int vobsub_id=-1; char* audio_lang=NULL; char* dvdsub_lang=NULL; @@ -3491,11 +3491,11 @@ if (mpctx->global_sub_size) { } else if (mpctx->global_sub_indices[SUB_SOURCE_SUBS] >= 0) { // if there are text subs to use, use those. (autosubs come last here) mpctx->global_sub_pos = mpctx->global_sub_indices[SUB_SOURCE_SUBS]; - } else if (dvdsub_id < 0 && mpctx->global_sub_indices[SUB_SOURCE_DEMUX] >= 0) { + } else if (dvdsub_id == -1 && mpctx->global_sub_indices[SUB_SOURCE_DEMUX] >= 0) { // finally select subs by language and container hints - if (dvdsub_id < 0 && dvdsub_lang) + if (dvdsub_id == -1 && dvdsub_lang) dvdsub_id = demuxer_sub_track_by_lang(mpctx->demuxer, dvdsub_lang); - if (dvdsub_id < 0) + if (dvdsub_id == -1) dvdsub_id = demuxer_default_sub_track(mpctx->demuxer); if (dvdsub_id >= 0) mpctx->global_sub_pos = mpctx->global_sub_indices[SUB_SOURCE_DEMUX] + dvdsub_id; |