changeset 11573:b293b4eb2c8c

Forced subs support for mencoder Patch by Corey Hickey <bugfood-ml@fatooh.org>
author attila
date Mon, 08 Dec 2003 09:32:40 +0000
parents 06761b6056ed
children 5b9e66e50cdc
files cfg-common.h cfg-mplayer.h mencoder.c
diffstat 3 files changed, 4 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/cfg-common.h	Mon Dec 08 01:10:31 2003 +0000
+++ b/cfg-common.h	Mon Dec 08 09:32:40 2003 +0000
@@ -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
--- a/cfg-mplayer.h	Mon Dec 08 01:10:31 2003 +0000
+++ b/cfg-mplayer.h	Mon Dec 08 09:32:40 2003 +0000
@@ -353,7 +353,6 @@
 	// 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},
 
--- a/mencoder.c	Mon Dec 08 01:10:31 2003 +0000
+++ b/mencoder.c	Mon Dec 08 09:32:40 2003 +0000
@@ -96,6 +96,7 @@
 int vo_doublebuffering=0;
 int vo_directrendering=0;
 int vo_config_count=0;
+int forced_subs_only=0;
 
 //--------------------------
 
@@ -611,6 +612,8 @@
   }
 #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");