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-es.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-es.h')
| -rw-r--r-- | help/help_mp-es.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/help/help_mp-es.h b/help/help_mp-es.h index 82af0a2745..59298c1e39 100644 --- a/help/help_mp-es.h +++ b/help/help_mp-es.h @@ -1618,8 +1618,6 @@ static const char help_text[]= // vd.c #define MSGTR_CodecDidNotSet "VDec: el codec no declaró sh->disp_w y sh->disp_h, intentando solucionarlo!\n" -#define MSGTR_VoConfigRequest "VDec: vo solicitud de config - %d x %d (csp preferida: %s).\n" -#define MSGTR_UsingXAsOutputCspNoY "VDec: usando %s como salida csp (no %d)\n" #define MSGTR_CouldNotFindColorspace "No se pudo encontrar colorspace concordante - reintentando escalado -vf...\n" #define MSGTR_MovieAspectIsSet "Aspecto es %.2f:1 - prescalando a aspecto correcto.\n" #define MSGTR_MovieAspectUndefined "Aspecto de película no es definido - no se ha aplicado prescalado.\n" |