Merge svn changes up to r29752

As part of merging subtitle-in-terminal changes make
update_subtitles() only clear existing subtitles if called with the
reset argument, and not try to set new ones. Later calls should set
the needed new subtitles, and this change avoids some problems with
trying to set subtitles when mp_property_sub() in command.c gets
called from initialization code before full initialization.

1 files changed, 2 insertions, 2 deletions

diff --git a/libvo/sub.c b/libvo/sub.c
index f729f56ad8..744652086d 100644
--- a/libvo/sub.c
+++ b/libvo/sub.c
@@ -359,9 +359,9 @@ inline static void vo_update_text_teletext(mp_osd_obj_t *obj, int dxs, int dys)
 
     //very simple teletext font auto scaling
     if(!vo_osd_teletext_scale && hm*(max_rows+1)>dys){
-        text_font_scale_factor*=1.0*(dys)/((max_rows+1)*hm);
+        osd_font_scale_factor*=1.0*(dys)/((max_rows+1)*hm);
         force_load_font=1;
-        vo_osd_teletext_scale=text_font_scale_factor;
+        vo_osd_teletext_scale=osd_font_scale_factor;
         obj->flags&=~OSDFLAG_VISIBLE;
         return;
     }