diff options
| author | attila <attila@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-12-08 09:32:40 +0000 |
|---|---|---|
| committer | attila <attila@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-12-08 09:32:40 +0000 |
| commit | 22c88e74e34fc32413fd3a32a8bbe94fcf97c7d0 (patch) | |
| tree | 6b318100dfb526a69b6c88f66e769f891c855cd1 | |
| parent | b5d062263281c50a98ab5382232b658937834f33 (diff) | |
| download | mpv-22c88e74e34fc32413fd3a32a8bbe94fcf97c7d0.tar.bz2 mpv-22c88e74e34fc32413fd3a32a8bbe94fcf97c7d0.tar.xz | |
Forced subs support for mencoder
Patch by Corey Hickey <bugfood-ml@fatooh.org>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11574 b3059339-0415-0410-9bf9-f77b7e298cf2
| -rw-r--r-- | cfg-common.h | 1 | ||||
| -rw-r--r-- | cfg-mplayer.h | 1 | ||||
| -rw-r--r-- | mencoder.c | 3 |
3 files changed, 4 insertions, 1 deletions
diff --git a/cfg-common.h b/cfg-common.h index 7201f847bc..eeec5b3a4c 100644 --- a/cfg-common.h +++ b/cfg-common.h @@ -227,6 +227,7 @@ {"nounicode", &sub_unicode, CONF_TYPE_FLAG, 0, 1, 0, NULL}, {"utf8", &sub_utf8, CONF_TYPE_FLAG, 0, 0, 1, NULL}, {"noutf8", &sub_utf8, CONF_TYPE_FLAG, 0, 1, 0, NULL}, + {"forcedsubsonly", &forced_subs_only, CONF_TYPE_FLAG, 0, 0, 1, NULL}, // specify IFO file for VOBSUB subtitle {"ifo", &spudec_ifo, CONF_TYPE_STRING, 0, 0, 0, NULL}, // enable Closed Captioning display diff --git a/cfg-mplayer.h b/cfg-mplayer.h index 50d2b6d932..2d65a3e98c 100644 --- a/cfg-mplayer.h +++ b/cfg-mplayer.h @@ -353,7 +353,6 @@ m_option_t mplayer_opts[]={ // these should be moved to -common, and suppot in mencoder too {"vobsub", &vobsub_name, CONF_TYPE_STRING, 0, 0, 0, NULL}, {"vobsubid", &vobsub_id, CONF_TYPE_INT, CONF_RANGE, 0, 31, NULL}, - {"forcedsubsonly", &forced_subs_only,CONF_TYPE_FLAG, 0, 0, 1, NULL}, {"sstep", &step_sec, CONF_TYPE_INT, CONF_MIN, 0, 0, NULL}, diff --git a/mencoder.c b/mencoder.c index 1782701faf..5b5035aab3 100644 --- a/mencoder.c +++ b/mencoder.c @@ -96,6 +96,7 @@ static uint32_t lavc_find_atag(char *codec); int vo_doublebuffering=0; int vo_directrendering=0; int vo_config_count=0; +int forced_subs_only=0; //-------------------------- @@ -611,6 +612,8 @@ vo_spudec=spudec_new_scaled(stream->type==STREAMTYPE_DVD?((dvd_priv_t *)(stream- } #endif +// Apply current settings for forced subs +spudec_set_forced_subs_only(vo_spudec,forced_subs_only); // set up output file: muxer_f=fopen(out_filename,"wb"); |