[Mplayer-cvslog] CVS: main cfg-common.h,1.120,1.121 cfg-mplayer.h,1.210,1.211 mencoder.c,1.223,1.224

[Attila Kinali CVS]

Update of /cvsroot/mplayer/main
In directory mail:/var/tmp.root/cvs-serv16476

Modified Files:
	cfg-common.h cfg-mplayer.h mencoder.c 
Log Message:
Forced subs support for mencoder
Patch by Corey Hickey <bugfood-ml at fatooh.org>


Index: cfg-common.h
===================================================================
RCS file: /cvsroot/mplayer/main/cfg-common.h,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -r1.120 -r1.121
--- cfg-common.h	12 Nov 2003 00:43:03 -0000	1.120
+++ cfg-common.h	8 Dec 2003 09:32:39 -0000	1.121
@@ -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

Index: cfg-mplayer.h
===================================================================
RCS file: /cvsroot/mplayer/main/cfg-mplayer.h,v
retrieving revision 1.210
retrieving revision 1.211
diff -u -r1.210 -r1.211
--- cfg-mplayer.h	30 Nov 2003 16:35:38 -0000	1.210
+++ cfg-mplayer.h	8 Dec 2003 09:32:40 -0000	1.211
@@ -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},
 

Index: mencoder.c
===================================================================
RCS file: /cvsroot/mplayer/main/mencoder.c,v
retrieving revision 1.223
retrieving revision 1.224
diff -u -r1.223 -r1.224
--- mencoder.c	2 Dec 2003 23:40:05 -0000	1.223
+++ mencoder.c	8 Dec 2003 09:32:40 -0000	1.224
@@ -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");