[MPlayer-cvslog] r29108 - in trunk: mencoder.c mplayer.c

[reimar]

Author: reimar
Date: Mon Mar 30 19:05:39 2009
New Revision: 29108

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

Modified:
   trunk/mencoder.c
   trunk/mplayer.c

Modified: trunk/mencoder.c
==============================================================================
--- trunk/mencoder.c	Mon Mar 30 14:23:28 2009	(r29107)
+++ trunk/mencoder.c	Mon Mar 30 19:05:39 2009	(r29108)
@@ -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: trunk/mplayer.c
==============================================================================
--- trunk/mplayer.c	Mon Mar 30 14:23:28 2009	(r29107)
+++ trunk/mplayer.c	Mon Mar 30 19:05:39 2009	(r29108)
@@ -1125,8 +1125,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);
+  }
 }
 
 /*
@@ -3066,6 +3068,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.