[MPlayer-cvslog] r31117 - in branches/1.0rc3: . mencoder.c mplayer.c

[siretart]

Author: siretart
Date: Sat May  1 20:26:58 2010
New Revision: 31117

Log:
Set the forced_subs_only value correctly whenever a new spudec is created.

backport r29108 by reimar

Modified:
   branches/1.0rc3/   (props changed)
   branches/1.0rc3/mencoder.c
   branches/1.0rc3/mplayer.c

Modified: branches/1.0rc3/mencoder.c
==============================================================================
--- branches/1.0rc3/mencoder.c	Sat May  1 20:25:24 2010	(r31116)
+++ branches/1.0rc3/mencoder.c	Sat May  1 20:26:58 2010	(r31117)
@@ -698,6 +698,8 @@ vo_spudec=spudec_new_scaled(stream->type
 			   sh_video->disp_w, sh_video->disp_h, NULL, 0);
 }
 #endif
+if (vo_spudec)
+  spudec_set_forced_subs_only(vo_spudec, forced_subs_only);
 }
 
 ostream = open_output_stream(out_filename, 0);

Modified: branches/1.0rc3/mplayer.c
==============================================================================
--- branches/1.0rc3/mplayer.c	Sat May  1 20:25:24 2010	(r31116)
+++ branches/1.0rc3/mplayer.c	Sat May  1 20:26:58 2010	(r31117)
@@ -1124,8 +1124,10 @@ void init_vo_spudec(void) {
     spudec_set_font_factor(vo_spudec,font_factor);
   }
 
-  if (vo_spudec!=NULL)
+  if (vo_spudec!=NULL) {
     initialized_flags|=INITIALIZED_SPUDEC;
+    mp_property_do("sub_forced_only", M_PROPERTY_SET, &forced_subs_only, mpctx);
+  }
 }
 
 /*
@@ -3065,6 +3067,7 @@ if (edl_output_filename) {
     if(vo_vobsub){
       initialized_flags|=INITIALIZED_VOBSUB;
       vobsub_set_from_lang(vo_vobsub, dvdsub_lang);
+      mp_property_do("sub_forced_only", M_PROPERTY_SET, &forced_subs_only, mpctx);
 
       // setup global sub numbering
       mpctx->global_sub_indices[SUB_SOURCE_VOBSUB] = mpctx->global_sub_size; // the global # of the first vobsub.