summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2012-11-15 15:16:12 +0100
committerwm4 <wm4@nowhere>2012-11-16 21:21:14 +0100
commit1fa1ff7880d6e991b67cbcc09a485d8a4b08aaaf (patch)
treed22ed5d7c9518af98092de7d865b127e43f16fd5
parent11ec5f19f231a7706804e283f958365eac1bc35c (diff)
downloadmpv-1fa1ff7880d6e991b67cbcc09a485d8a4b08aaaf.tar.bz2
mpv-1fa1ff7880d6e991b67cbcc09a485d8a4b08aaaf.tar.xz
video/filter: rename vf_eq2 to vf_eq
vf_eq was deleted earlier, which makes the name vf_eq2 even more awkward.
-rw-r--r--DOCS/man/en/mpv.rst4
-rw-r--r--DOCS/man/en/vf.rst2
-rw-r--r--Makefile2
-rw-r--r--video/filter/vf.c4
-rw-r--r--video/filter/vf_eq.c (renamed from video/filter/vf_eq2.c)4
5 files changed, 8 insertions, 8 deletions
diff --git a/DOCS/man/en/mpv.rst b/DOCS/man/en/mpv.rst
index 8b6dc0acca..209213fccd 100644
--- a/DOCS/man/en/mpv.rst
+++ b/DOCS/man/en/mpv.rst
@@ -170,7 +170,7 @@ c
Change YUV colorspace.
(The following keys are valid only when using a video output that supports the
-corresponding adjustment, or the software equalizer (``--vf=eq2``).)
+corresponding adjustment, or the software equalizer (``--vf=eq``).)
1 and 2
Adjust contrast.
@@ -351,7 +351,7 @@ as the file played and then tries to load any file-specific configuration.
| # start with mf://filemask
| mf=type=png:fps=25
| # Eerie negative images are cool.
-| vf=eq2=1.0:-0.8
+| vf=eq=1.0:-0.8
PROFILES
diff --git a/DOCS/man/en/vf.rst b/DOCS/man/en/vf.rst
index f96fb20ac9..e120c39f0b 100644
--- a/DOCS/man/en/vf.rst
+++ b/DOCS/man/en/vf.rst
@@ -405,7 +405,7 @@ hqdn3d[=luma_spatial:chroma_spatial:luma_tmp:chroma_tmp]
chroma temporal strength (default:
``luma_tmp*chroma_spatial/luma_spatial``)
-eq2[=gamma:contrast:brightness:saturation:rg:gg:bg:weight]
+eq[=gamma:contrast:brightness:saturation:rg:gg:bg:weight]
Software equalizer that uses lookup tables (slow),
allowing gamma correction in addition to simple brightness and contrast
adjustment. The parameters are given as floating point
diff --git a/Makefile b/Makefile
index ec2389c26d..6a7094ca7b 100644
--- a/Makefile
+++ b/Makefile
@@ -243,7 +243,7 @@ SOURCES = talloc.c \
video/filter/vf_dlopen.c \
video/filter/vf_down3dright.c \
video/filter/vf_dsize.c \
- video/filter/vf_eq2.c \
+ video/filter/vf_eq.c \
video/filter/vf_expand.c \
video/filter/vf_flip.c \
video/filter/vf_format.c \
diff --git a/video/filter/vf.c b/video/filter/vf.c
index cf8866f0ac..ce842868ef 100644
--- a/video/filter/vf.c
+++ b/video/filter/vf.c
@@ -48,7 +48,7 @@ extern const vf_info_t vf_info_flip;
extern const vf_info_t vf_info_rotate;
extern const vf_info_t vf_info_mirror;
extern const vf_info_t vf_info_noise;
-extern const vf_info_t vf_info_eq2;
+extern const vf_info_t vf_info_eq;
extern const vf_info_t vf_info_gradfun;
extern const vf_info_t vf_info_unsharp;
extern const vf_info_t vf_info_swapuv;
@@ -89,7 +89,7 @@ static const vf_info_t *const filter_list[] = {
&vf_info_screenshot_force,
&vf_info_noise,
- &vf_info_eq2,
+ &vf_info_eq,
&vf_info_gradfun,
&vf_info_unsharp,
&vf_info_swapuv,
diff --git a/video/filter/vf_eq2.c b/video/filter/vf_eq.c
index b39e8b087c..946fa73550 100644
--- a/video/filter/vf_eq2.c
+++ b/video/filter/vf_eq.c
@@ -509,9 +509,9 @@ int vf_open(vf_instance_t *vf, char *args)
return 1;
}
-const vf_info_t vf_info_eq2 = {
+const vf_info_t vf_info_eq = {
"Software equalizer",
- "eq2",
+ "eq",
"Hampa Hug, Daniel Moreno, Richard Felker",
"",
&vf_open,