# HG changeset patch
# User gpoirier
# Date 1160999831 0
# Node ID 135e5919638f0e7f1e1eeb7157e0be6b32288e32
# Parent  d2fc682be761afde6affb16973151499d19beb0c
Use American spelling of "gray" instead for British's "grey" for XviD option, while keeping backward compatibility

diff -r d2fc682be761 -r 135e5919638f DOCS/man/en/mplayer.1
--- a/DOCS/man/en/mplayer.1	Mon Oct 16 10:25:50 2006 +0000
+++ b/DOCS/man/en/mplayer.1	Mon Oct 16 11:57:11 2006 +0000
@@ -8601,8 +8601,8 @@
 As of XviD-1.0.x, this option is replaced by the closed_gop option.
 .
 .TP
-.B (no)greyscale
-Make XviD discard chroma planes so the encoded video is greyscale only.
+.B (no)grayscale
+Make XviD discard chroma planes so the encoded video is grayscale only.
 Note that this does not speed up encoding, it just prevents chroma data
 from being written in the last stage of encoding.
 .
@@ -8737,7 +8737,7 @@
 It reduces PSNR by nature, as the mathematical deviation to the original
 picture will get bigger, but the subjective image quality will raise.
 Since it works with color information, you might want to turn it off when
-encoding in greyscale.
+encoding in grayscale.
 .
 .TP
 .B (no)hq_ac
diff -r d2fc682be761 -r 135e5919638f DOCS/man/fr/mplayer.1
--- a/DOCS/man/fr/mplayer.1	Mon Oct 16 10:25:50 2006 +0000
+++ b/DOCS/man/fr/mplayer.1	Mon Oct 16 11:57:11 2006 +0000
@@ -9068,7 +9068,7 @@
 closed_gop.
 .
 .TP
-.B (no)greyscale
+.B (no)grayscale
 Indique à XviD de ne pas enregistrer l'information de chroma pour que la
 vidéo produite ne soit qu'en noir & blanc.
 Notez que cela ne changera en rien le temps de compression, cela évitera juste
diff -r d2fc682be761 -r 135e5919638f libmpcodecs/ve_xvid4.c
--- a/libmpcodecs/ve_xvid4.c	Mon Oct 16 10:25:50 2006 +0000
+++ b/libmpcodecs/ve_xvid4.c	Mon Oct 16 11:57:11 2006 +0000
@@ -331,7 +331,8 @@
 	{"nohq_ac", &xvidenc_hqacpred, CONF_TYPE_FLAG, 0, 1, 0, NULL},
 	{"frame_drop_ratio", &xvidenc_frame_drop_ratio, CONF_TYPE_INT, CONF_RANGE, 0, 100, NULL},
 	{"max_key_interval", &xvidenc_max_key_interval, CONF_TYPE_INT, CONF_MIN, 0, 0, NULL},
-	{"greyscale", &xvidenc_greyscale, CONF_TYPE_FLAG, 0, 0, 1, NULL},
+	{"greyscale", &xvidenc_greyscale, CONF_TYPE_FLAG, 0, 0, 1, NULL}, /* kept for backward compatibility */
+	{"grayscale", &xvidenc_greyscale, CONF_TYPE_FLAG, 0, 0, 1, NULL},		
 	{"nogreyscale", &xvidenc_greyscale, CONF_TYPE_FLAG, 0, 1, 0, NULL},
 	{"lumi_mask", &xvidenc_luminance_masking, CONF_TYPE_FLAG, 0, 0, 1, NULL},
 	{"nolumi_mask", &xvidenc_luminance_masking, CONF_TYPE_FLAG, 0, 1, 0, NULL},