diff options
| author | gpoirier <gpoirier@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-10-16 11:57:11 +0000 |
|---|---|---|
| committer | gpoirier <gpoirier@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-10-16 11:57:11 +0000 |
| commit | 087b6f4c1b56cf09e5d1dbaa2a57759f55ca1ccc (patch) | |
| tree | 059d7b1c41363c1c8b483bfeecf829f1fb01cb25 | |
| parent | e9f17bbc188cdd8cf0f9206ae14a057a4f58469e (diff) | |
| download | mpv-087b6f4c1b56cf09e5d1dbaa2a57759f55ca1ccc.tar.bz2 mpv-087b6f4c1b56cf09e5d1dbaa2a57759f55ca1ccc.tar.xz | |
Use American spelling of "gray" instead for British's "grey" for XviD option, while keeping backward compatibility
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20265 b3059339-0415-0410-9bf9-f77b7e298cf2
| -rw-r--r-- | DOCS/man/en/mplayer.1 | 6 | ||||
| -rw-r--r-- | DOCS/man/fr/mplayer.1 | 2 | ||||
| -rw-r--r-- | libmpcodecs/ve_xvid4.c | 3 |
3 files changed, 6 insertions, 5 deletions
diff --git a/DOCS/man/en/mplayer.1 b/DOCS/man/en/mplayer.1 index 43d3849d96..e35e1cf16d 100644 --- a/DOCS/man/en/mplayer.1 +++ b/DOCS/man/en/mplayer.1 @@ -8601,8 +8601,8 @@ This seems to be mandatory only for old versions of DivX's decoder. 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 will improve quality at the cost of encoding speed. 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 --git a/DOCS/man/fr/mplayer.1 b/DOCS/man/fr/mplayer.1 index da8526c7ff..2d759e8c2a 100644 --- a/DOCS/man/fr/mplayer.1 +++ b/DOCS/man/fr/mplayer.1 @@ -9068,7 +9068,7 @@ Ceci ne semble nécessaire qu'avec de vieilles versions du décodeur de DivX. 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 --git a/libmpcodecs/ve_xvid4.c b/libmpcodecs/ve_xvid4.c index 0ef1cfcaa7..5af21bd7e5 100644 --- a/libmpcodecs/ve_xvid4.c +++ b/libmpcodecs/ve_xvid4.c @@ -331,7 +331,8 @@ m_option_t xvidencopts_conf[] = {"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}, |