diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-10-06 04:28:59 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-10-06 04:48:00 +0300 |
| commit | 7fd3eb0f74e7986e07556077ed654bad7869add8 (patch) | |
| tree | 8d293145c0ef2bc31ca63f79dccb4e3b57294c82 /help/help_mp-en.h | |
| parent | ef438b3a6b5bc714d521dd46d3ccb798ecd31eed (diff) | |
| parent | cbbc886820e981f488660708678f528e1d243121 (diff) | |
| download | mpv-7fd3eb0f74e7986e07556077ed654bad7869add8.tar.bz2 mpv-7fd3eb0f74e7986e07556077ed654bad7869add8.tar.xz | |
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.
Diffstat (limited to 'help/help_mp-en.h')
| -rw-r--r-- | help/help_mp-en.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/help/help_mp-en.h b/help/help_mp-en.h index f1af384320..2c70f83dc4 100644 --- a/help/help_mp-en.h +++ b/help/help_mp-en.h @@ -1633,8 +1633,6 @@ static const char help_text[]= // vd.c #define MSGTR_CodecDidNotSet "VDec: Codec did not set sh->disp_w and sh->disp_h, trying workaround.\n" -#define MSGTR_VoConfigRequest "VDec: vo config request - %d x %d (preferred colorspace: %s)\n" -#define MSGTR_UsingXAsOutputCspNoY "VDec: using %s as output csp (no %d)\n" #define MSGTR_CouldNotFindColorspace "Could not find matching colorspace - retrying with -vf scale...\n" #define MSGTR_MovieAspectIsSet "Movie-Aspect is %.2f:1 - prescaling to correct movie aspect.\n" #define MSGTR_MovieAspectUndefined "Movie-Aspect is undefined - no prescaling applied.\n" |