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-fr.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-fr.h')
| -rw-r--r-- | help/help_mp-fr.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/help/help_mp-fr.h b/help/help_mp-fr.h index 4350f97c0c..a3baeffd52 100644 --- a/help/help_mp-fr.h +++ b/help/help_mp-fr.h @@ -688,7 +688,6 @@ static const char help_text[]= // vd.c #define MSGTR_CodecDidNotSet "VDec : le codec n'a pas défini sh->disp_w et sh->disp_h, essai de contournement !\n" -#define MSGTR_VoConfigRequest "VDec : requête de config de vo - %d x %d (espace colorimétrique préferé : %s)\n" #define MSGTR_CouldNotFindColorspace "N'a pas pu trouver espace colorimétrique correspondant - nouvel essai avec -vf scale...\n" #define MSGTR_MovieAspectIsSet "L'aspect du film est %.2f:1 - pré-redimensionnement à l'aspect correct.\n" #define MSGTR_MovieAspectUndefined "L'aspect du film est indéfini - pas de pré-dimensionnement appliqué.\n" |