summaryrefslogtreecommitdiffstats
path: root/video
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-10-23 19:06:42 +0200
committerwm4 <wm4@nowhere>2013-10-23 19:30:01 +0200
commit6d44a4dfd1487611dd8ff3da4a6566e64c17106a (patch)
tree1ae7c30d50cb64668dacb78f8354185440978a9c /video
parentc8930e80a850a9459157023db57ae723f7a82432 (diff)
downloadmpv-6d44a4dfd1487611dd8ff3da4a6566e64c17106a.tar.bz2
mpv-6d44a4dfd1487611dd8ff3da4a6566e64c17106a.tar.xz
video/filter: remove useless vf_info fields
This time I didn't bother to move the contents of the author field to the file headers. "git log" is your friend.
Diffstat (limited to 'video')
-rw-r--r--video/filter/vf.c4
-rw-r--r--video/filter/vf.h6
-rw-r--r--video/filter/vf_crop.c8
-rw-r--r--video/filter/vf_delogo.c8
-rw-r--r--video/filter/vf_divtc.c9
-rw-r--r--video/filter/vf_dlopen.c8
-rw-r--r--video/filter/vf_down3dright.c9
-rw-r--r--video/filter/vf_dsize.c9
-rw-r--r--video/filter/vf_eq.c9
-rw-r--r--video/filter/vf_expand.c8
-rw-r--r--video/filter/vf_flip.c9
-rw-r--r--video/filter/vf_format.c8
-rw-r--r--video/filter/vf_gradfun.c8
-rw-r--r--video/filter/vf_hqdn3d.c9
-rw-r--r--video/filter/vf_ilpack.c9
-rw-r--r--video/filter/vf_lavfi.c8
-rw-r--r--video/filter/vf_mirror.c9
-rw-r--r--video/filter/vf_noformat.c8
-rw-r--r--video/filter/vf_noise.c9
-rw-r--r--video/filter/vf_phase.c9
-rw-r--r--video/filter/vf_pp.c9
-rw-r--r--video/filter/vf_pullup.c9
-rw-r--r--video/filter/vf_rotate.c9
-rw-r--r--video/filter/vf_scale.c8
-rw-r--r--video/filter/vf_screenshot.c9
-rw-r--r--video/filter/vf_softpulldown.c9
-rw-r--r--video/filter/vf_stereo3d.c8
-rw-r--r--video/filter/vf_sub.c8
-rw-r--r--video/filter/vf_swapuv.c9
-rw-r--r--video/filter/vf_unsharp.c9
-rw-r--r--video/filter/vf_vavpp.c6
-rw-r--r--video/filter/vf_vo.c9
-rw-r--r--video/filter/vf_yadif.c8
33 files changed, 96 insertions, 178 deletions
diff --git a/video/filter/vf.c b/video/filter/vf.c
index 1e27c043b5..c2e15090b8 100644
--- a/video/filter/vf.c
+++ b/video/filter/vf.c
@@ -126,7 +126,7 @@ static bool get_desc(struct m_obj_desc *dst, int index)
const vf_info_t *vf = filter_list[index];
*dst = (struct m_obj_desc) {
.name = vf->name,
- .description = vf->info,
+ .description = vf->description,
.priv_size = vf->priv_size,
.priv_defaults = vf->priv_defaults,
.options = vf->options,
@@ -254,7 +254,7 @@ static struct vf_instance *vf_open(struct MPOpts *opts, vf_instance_t *next,
if (m_config_initialize_obj(config, &desc, &priv, &args) < 0)
goto error;
vf->priv = priv;
- int retcode = vf->info->vf_open(vf, (char *)args);
+ int retcode = vf->info->open(vf, (char *)args);
if (retcode < 1)
goto error;
return vf;
diff --git a/video/filter/vf.h b/video/filter/vf.h
index 9f041a79b4..c946a31359 100644
--- a/video/filter/vf.h
+++ b/video/filter/vf.h
@@ -31,11 +31,9 @@ struct vf_instance;
struct vf_priv_s;
typedef struct vf_info {
- const char *info;
+ const char *description;
const char *name;
- const char *author;
- const char *comment;
- int (*vf_open)(struct vf_instance *vf, char *args);
+ int (*open)(struct vf_instance *vf, char *args);
void *damn_you;
int priv_size;
const void *priv_defaults;
diff --git a/video/filter/vf_crop.c b/video/filter/vf_crop.c
index cd4f077251..b07f9c6db1 100644
--- a/video/filter/vf_crop.c
+++ b/video/filter/vf_crop.c
@@ -104,11 +104,9 @@ static const m_option_t vf_opts_fields[] = {
};
const vf_info_t vf_info_crop = {
- "cropping",
- "crop",
- "A'rpi",
- "",
- vf_open,
+ .description = "cropping",
+ .name = "crop",
+ .open = vf_open,
.priv_size = sizeof(struct vf_priv_s),
.priv_defaults = &vf_priv_dflt,
.options = vf_opts_fields,
diff --git a/video/filter/vf_delogo.c b/video/filter/vf_delogo.c
index 269464f605..98bb34bb7c 100644
--- a/video/filter/vf_delogo.c
+++ b/video/filter/vf_delogo.c
@@ -316,11 +316,9 @@ static const m_option_t vf_opts_fields[] = {
};
const vf_info_t vf_info_delogo = {
- "simple logo remover",
- "delogo",
- "Jindrich Makovicka, Alex Beregszaszi",
- "",
- vf_open,
+ .description = "simple logo remover",
+ .name = "delogo",
+ .open = vf_open,
.priv_size = sizeof(struct vf_priv_s),
.priv_defaults = &vf_priv_dflt,
.options = vf_opts_fields,
diff --git a/video/filter/vf_divtc.c b/video/filter/vf_divtc.c
index 56a6698027..fc25aa89be 100644
--- a/video/filter/vf_divtc.c
+++ b/video/filter/vf_divtc.c
@@ -720,10 +720,7 @@ static int vf_open(vf_instance_t *vf, char *args)
const vf_info_t vf_info_divtc =
{
- "inverse telecine for deinterlaced video",
- "divtc",
- "Ville Saari",
- "",
- vf_open,
- NULL
+ .description = "inverse telecine for deinterlaced video",
+ .name = "divtc",
+ .open = vf_open,
};
diff --git a/video/filter/vf_dlopen.c b/video/filter/vf_dlopen.c
index 0a100a8b6b..e034b6eadb 100644
--- a/video/filter/vf_dlopen.c
+++ b/video/filter/vf_dlopen.c
@@ -375,11 +375,9 @@ static const m_option_t vf_opts_fields[] = {
};
const vf_info_t vf_info_dlopen = {
- "Dynamic library filter",
- "dlopen",
- "Rudolf Polzer",
- "",
- vf_open,
+ .description = "Dynamic library filter",
+ .name = "dlopen",
+ .open = vf_open,
.priv_size = sizeof(struct vf_priv_s),
.priv_defaults = &vf_priv_dflt,
.options = vf_opts_fields,
diff --git a/video/filter/vf_down3dright.c b/video/filter/vf_down3dright.c
index 7cb75b14dd..14deeda94e 100644
--- a/video/filter/vf_down3dright.c
+++ b/video/filter/vf_down3dright.c
@@ -150,10 +150,7 @@ static int vf_open(vf_instance_t *vf, char *args)
}
const vf_info_t vf_info_down3dright = {
- "convert stereo movie from top-bottom to left-right field",
- "down3dright",
- "Zdenek Kabelac",
- "",
- vf_open,
- NULL
+ .description = "convert stereo movie from top-bottom to left-right field",
+ .name = "down3dright",
+ .open = vf_open,
};
diff --git a/video/filter/vf_dsize.c b/video/filter/vf_dsize.c
index a85457e7ef..31b1dde568 100644
--- a/video/filter/vf_dsize.c
+++ b/video/filter/vf_dsize.c
@@ -114,10 +114,7 @@ static int vf_open(vf_instance_t *vf, char *args)
}
const vf_info_t vf_info_dsize = {
- "reset displaysize/aspect",
- "dsize",
- "Rich Felker",
- "",
- vf_open,
- NULL
+ .description = "reset displaysize/aspect",
+ .name = "dsize",
+ .open = vf_open,
};
diff --git a/video/filter/vf_eq.c b/video/filter/vf_eq.c
index 9002d7504e..1bca39bab5 100644
--- a/video/filter/vf_eq.c
+++ b/video/filter/vf_eq.c
@@ -522,10 +522,7 @@ int vf_open(vf_instance_t *vf, char *args)
}
const vf_info_t vf_info_eq = {
- "Software equalizer",
- "eq",
- "Hampa Hug, Daniel Moreno, Richard Felker",
- "",
- &vf_open,
- NULL
+ .description = "Software equalizer",
+ .name = "eq",
+ .open = &vf_open,
};
diff --git a/video/filter/vf_expand.c b/video/filter/vf_expand.c
index 11983f56ec..51f49862d7 100644
--- a/video/filter/vf_expand.c
+++ b/video/filter/vf_expand.c
@@ -175,11 +175,9 @@ static const m_option_t vf_opts_fields[] = {
};
const vf_info_t vf_info_expand = {
- "expanding",
- "expand",
- "A'rpi",
- "",
- vf_open,
+ .description = "expanding",
+ .name = "expand",
+ .open = vf_open,
.priv_size = sizeof(struct vf_priv_s),
.priv_defaults = &vf_priv_dflt,
.options = vf_opts_fields,
diff --git a/video/filter/vf_flip.c b/video/filter/vf_flip.c
index e9d2796724..6500053032 100644
--- a/video/filter/vf_flip.c
+++ b/video/filter/vf_flip.c
@@ -59,12 +59,9 @@ static int vf_open(vf_instance_t *vf, char *args){
}
const vf_info_t vf_info_flip = {
- "flip image upside-down",
- "flip",
- "A'rpi",
- "",
- vf_open,
- NULL
+ .description = "flip image upside-down",
+ .name = "flip",
+ .open = vf_open,
};
//===========================================================================//
diff --git a/video/filter/vf_format.c b/video/filter/vf_format.c
index e5d4c117e7..1ddbc079bd 100644
--- a/video/filter/vf_format.c
+++ b/video/filter/vf_format.c
@@ -80,11 +80,9 @@ static const m_option_t vf_opts_fields[] = {
};
const vf_info_t vf_info_format = {
- "force output format",
- "format",
- "A'rpi",
- "FIXME! get_image()/put_image()",
- vf_open,
+ .description = "force output format",
+ .name = "format",
+ .open = vf_open,
.priv_size = sizeof(struct vf_priv_s),
.priv_defaults = &vf_priv_dflt,
.options = vf_opts_fields,
diff --git a/video/filter/vf_gradfun.c b/video/filter/vf_gradfun.c
index fa136269dd..f7b39fa999 100644
--- a/video/filter/vf_gradfun.c
+++ b/video/filter/vf_gradfun.c
@@ -401,11 +401,9 @@ static const m_option_t vf_opts_fields[] = {
};
const vf_info_t vf_info_gradfun = {
- "gradient deband",
- "gradfun",
- "Loren Merritt",
- "",
- vf_open,
+ .description = "gradient deband",
+ .name = "gradfun",
+ .open = vf_open,
.priv_size = sizeof(struct vf_priv_s),
.priv_defaults = &vf_priv_dflt,
.options = vf_opts_fields,
diff --git a/video/filter/vf_hqdn3d.c b/video/filter/vf_hqdn3d.c
index ead6bd3466..67f3c7845d 100644
--- a/video/filter/vf_hqdn3d.c
+++ b/video/filter/vf_hqdn3d.c
@@ -356,12 +356,9 @@ static int vf_open(vf_instance_t *vf, char *args){
}
const vf_info_t vf_info_hqdn3d = {
- "High Quality 3D Denoiser",
- "hqdn3d",
- "Daniel Moreno & A'rpi",
- "",
- vf_open,
- NULL
+ .description = "High Quality 3D Denoiser",
+ .name = "hqdn3d",
+ .open = vf_open,
};
//===========================================================================//
diff --git a/video/filter/vf_ilpack.c b/video/filter/vf_ilpack.c
index d288ef07b6..136e8917ed 100644
--- a/video/filter/vf_ilpack.c
+++ b/video/filter/vf_ilpack.c
@@ -444,10 +444,7 @@ static int vf_open(vf_instance_t *vf, char *args)
}
const vf_info_t vf_info_ilpack = {
- "4:2:0 planar -> 4:2:2 packed reinterlacer",
- "ilpack",
- "Richard Felker",
- "",
- vf_open,
- NULL
+ .description = "4:2:0 planar -> 4:2:2 packed reinterlacer",
+ .name = "ilpack",
+ .open = vf_open,
};
diff --git a/video/filter/vf_lavfi.c b/video/filter/vf_lavfi.c
index 352350804b..115809986b 100644
--- a/video/filter/vf_lavfi.c
+++ b/video/filter/vf_lavfi.c
@@ -334,11 +334,9 @@ static const m_option_t vf_opts_fields[] = {
};
const vf_info_t vf_info_lavfi = {
- "libavfilter bridge",
- "lavfi",
- "",
- "",
- vf_open,
+ .description = "libavfilter bridge",
+ .name = "lavfi",
+ .open = vf_open,
.priv_size = sizeof(struct vf_priv_s),
.priv_defaults = &vf_priv_dflt,
.options = vf_opts_fields,
diff --git a/video/filter/vf_mirror.c b/video/filter/vf_mirror.c
index c51c9617cb..88658c5436 100644
--- a/video/filter/vf_mirror.c
+++ b/video/filter/vf_mirror.c
@@ -103,12 +103,9 @@ static int vf_open(vf_instance_t *vf, char *args){
}
const vf_info_t vf_info_mirror = {
- "horizontal mirror",
- "mirror",
- "Eyck",
- "",
- vf_open,
- NULL
+ .description = "horizontal mirror",
+ .name = "mirror",
+ .open = vf_open,
};
//===========================================================================//
diff --git a/video/filter/vf_noformat.c b/video/filter/vf_noformat.c
index 2a668c6d44..993c805060 100644
--- a/video/filter/vf_noformat.c
+++ b/video/filter/vf_noformat.c
@@ -56,11 +56,9 @@ static const m_option_t vf_opts_fields[] = {
};
const vf_info_t vf_info_noformat = {
- "disallow one output format",
- "noformat",
- "Joey",
- "",
- vf_open,
+ .description = "disallow one output format",
+ .name = "noformat",
+ .open = vf_open,
.priv_size = sizeof(struct vf_priv_s),
.priv_defaults = &vf_priv_dflt,
.options = vf_opts_fields,
diff --git a/video/filter/vf_noise.c b/video/filter/vf_noise.c
index 9d880a6d34..970e762b10 100644
--- a/video/filter/vf_noise.c
+++ b/video/filter/vf_noise.c
@@ -431,12 +431,9 @@ static int vf_open(vf_instance_t *vf, char *args){
}
const vf_info_t vf_info_noise = {
- "noise generator",
- "noise",
- "Michael Niedermayer",
- "",
- vf_open,
- NULL
+ .description = "noise generator",
+ .name = "noise",
+ .open = vf_open,
};
//===========================================================================//
diff --git a/video/filter/vf_phase.c b/video/filter/vf_phase.c
index deb2b0dbe5..f2a4a3f4be 100644
--- a/video/filter/vf_phase.c
+++ b/video/filter/vf_phase.c
@@ -290,10 +290,7 @@ static int vf_open(vf_instance_t *vf, char *args)
const vf_info_t vf_info_phase =
{
- "phase shift fields",
- "phase",
- "Ville Saari",
- "",
- vf_open,
- NULL
+ .description = "phase shift fields",
+ .name = "phase",
+ .open = vf_open,
};
diff --git a/video/filter/vf_pp.c b/video/filter/vf_pp.c
index 2112685c4b..c34252a3ef 100644
--- a/video/filter/vf_pp.c
+++ b/video/filter/vf_pp.c
@@ -166,12 +166,9 @@ static int vf_open(vf_instance_t *vf, char *args){
}
const vf_info_t vf_info_pp = {
- "postprocessing",
- "pp",
- "A'rpi",
- "",
- vf_open,
- NULL
+ .description = "postprocessing",
+ .name = "pp",
+ .open = vf_open,
};
//===========================================================================//
diff --git a/video/filter/vf_pullup.c b/video/filter/vf_pullup.c
index 4d0fee6be6..163ad70ed4 100644
--- a/video/filter/vf_pullup.c
+++ b/video/filter/vf_pullup.c
@@ -263,10 +263,7 @@ static int vf_open(vf_instance_t *vf, char *args)
}
const vf_info_t vf_info_pullup = {
- "pullup (from field sequence to frames)",
- "pullup",
- "Rich Felker",
- "",
- vf_open,
- NULL
+ .description = "pullup (from field sequence to frames)",
+ .name = "pullup",
+ .open = vf_open,
};
diff --git a/video/filter/vf_rotate.c b/video/filter/vf_rotate.c
index 05673d76ce..58cac932ff 100644
--- a/video/filter/vf_rotate.c
+++ b/video/filter/vf_rotate.c
@@ -125,12 +125,9 @@ static int vf_open(vf_instance_t *vf, char *args){
}
const vf_info_t vf_info_rotate = {
- "rotate",
- "rotate",
- "A'rpi",
- "",
- vf_open,
- NULL
+ .description = "rotate",
+ .name = "rotate",
+ .open = vf_open,
};
//===========================================================================//
diff --git a/video/filter/vf_scale.c b/video/filter/vf_scale.c
index 2d89f3209c..6ac9d43eb9 100644
--- a/video/filter/vf_scale.c
+++ b/video/filter/vf_scale.c
@@ -426,11 +426,9 @@ static const m_option_t vf_opts_fields[] = {
};
const vf_info_t vf_info_scale = {
- "software scaling",
- "scale",
- "A'rpi",
- "",
- vf_open,
+ .description = "software scaling",
+ .name = "scale",
+ .open = vf_open,
.priv_size = sizeof(struct vf_priv_s),
.priv_defaults = &vf_priv_dflt,
.options = vf_opts_fields,
diff --git a/video/filter/vf_screenshot.c b/video/filter/vf_screenshot.c
index b28479963d..5941093429 100644
--- a/video/filter/vf_screenshot.c
+++ b/video/filter/vf_screenshot.c
@@ -84,10 +84,7 @@ static int vf_open(vf_instance_t *vf, char *args)
}
const vf_info_t vf_info_screenshot = {
- "screenshot to file",
- "screenshot",
- "A'rpi, Jindrich Makovicka",
- "",
- vf_open,
- NULL
+ .description = "screenshot to file",
+ .name = "screenshot",
+ .open = vf_open,
};
diff --git a/video/filter/vf_softpulldown.c b/video/filter/vf_softpulldown.c
index 9968c57a1f..9a73e39110 100644
--- a/video/filter/vf_softpulldown.c
+++ b/video/filter/vf_softpulldown.c
@@ -163,10 +163,7 @@ static int vf_open(vf_instance_t *vf, char *args)
}
const vf_info_t vf_info_softpulldown = {
- "mpeg2 soft 3:2 pulldown",
- "softpulldown",
- "Tobias Diedrich <ranma+mplayer@tdiedrich.de>",
- "",
- vf_open,
- NULL
+ .description = "mpeg2 soft 3:2 pulldown",
+ .name = "softpulldown",
+ .open = vf_open,
};
diff --git a/video/filter/vf_stereo3d.c b/video/filter/vf_stereo3d.c
index 07e8489b7a..82c184b8fa 100644
--- a/video/filter/vf_stereo3d.c
+++ b/video/filter/vf_stereo3d.c
@@ -465,11 +465,9 @@ static const m_option_t vf_opts_fields[] = {
//==info struct==//
const vf_info_t vf_info_stereo3d = {
- "stereoscopic 3d view",
- "stereo3d",
- "Gordon Schmidt",
- "view stereoscopic videos",
- vf_open,
+ .description = "stereoscopic 3d view",
+ .name = "stereo3d",
+ .open = vf_open,
.priv_size = sizeof(struct vf_priv_s),
.priv_defaults = &vf_priv_default,
.options = vf_opts_fields,
diff --git a/video/filter/vf_sub.c b/video/filter/vf_sub.c
index 814b8a0fca..0c72105cda 100644
--- a/video/filter/vf_sub.c
+++ b/video/filter/vf_sub.c
@@ -147,11 +147,9 @@ static const m_option_t vf_opts_fields[] = {
};
const vf_info_t vf_info_sub = {
- "Render subtitles",
- "sub",
- "Evgeniy Stepanov",
- "",
- vf_open,
+ .description = "Render subtitles",
+ .name = "sub",
+ .open = vf_open,
.priv_size = sizeof(struct vf_priv_s),
.priv_defaults = &vf_priv_dflt,
.options = vf_opts_fields,
diff --git a/video/filter/vf_swapuv.c b/video/filter/vf_swapuv.c
index 64d8d61b7b..a09ca04d5f 100644
--- a/video/filter/vf_swapuv.c
+++ b/video/filter/vf_swapuv.c
@@ -56,12 +56,9 @@ static int vf_open(vf_instance_t *vf, char *args){
}
const vf_info_t vf_info_swapuv = {
- "UV swapper",
- "swapuv",
- "Michael Niedermayer",
- "",
- vf_open,
- NULL
+ .description = "UV swapper",
+ .name = "swapuv",
+ .open = vf_open,
};
//===========================================================================//
diff --git a/video/filter/vf_unsharp.c b/video/filter/vf_unsharp.c
index 728def61b4..cd65687780 100644
--- a/video/filter/vf_unsharp.c
+++ b/video/filter/vf_unsharp.c
@@ -285,12 +285,9 @@ static int vf_open( vf_instance_t *vf, char *args ) {
}
const vf_info_t vf_info_unsharp = {
- "unsharp mask & gaussian blur",
- "unsharp",
- "Remi Guyomarch",
- "",
- vf_open,
- NULL
+ .description = "unsharp mask & gaussian blur",
+ .name = "unsharp",
+ .open = vf_open,
};
//===========================================================================//
diff --git a/video/filter/vf_vavpp.c b/video/filter/vf_vavpp.c
index ba4e9ca411..62dd9a77a0 100644
--- a/video/filter/vf_vavpp.c
+++ b/video/filter/vf_vavpp.c
@@ -395,11 +395,9 @@ static const m_option_t vf_opts_fields[] = {
};
const vf_info_t vf_info_vaapi = {
- .info = "VA-API Video Post-Process Filter",
+ .description = "VA-API Video Post-Process Filter",
.name = "vavpp",
- .author = "xylosper",
- .comment = "",
- .vf_open = vf_open,
+ .open = vf_open,
.priv_size = sizeof(struct vf_priv_s),
.priv_defaults = &vf_priv_default,
.options = vf_opts_fields,
diff --git a/video/filter/vf_vo.c b/video/filter/vf_vo.c
index 2e6e8e7170..5b6e2ab4d2 100644
--- a/video/filter/vf_vo.c
+++ b/video/filter/vf_vo.c
@@ -115,10 +115,7 @@ static int vf_open(vf_instance_t *vf, char *args)
}
const vf_info_t vf_info_vo = {
- "libvo wrapper",
- "vo",
- "A'rpi",
- "for internal use",
- vf_open,
- NULL
+ .description = "libvo wrapper",
+ .name = "vo",
+ .open = vf_open,
};
diff --git a/video/filter/vf_yadif.c b/video/filter/vf_yadif.c
index 29156986db..b9a48c6da2 100644
--- a/video/filter/vf_yadif.c
+++ b/video/filter/vf_yadif.c
@@ -524,11 +524,9 @@ static const m_option_t vf_opts_fields[] = {
};
const vf_info_t vf_info_yadif = {
- "Yet Another DeInterlacing Filter",
- "yadif",
- "Michael Niedermayer",
- "",
- vf_open,
+ .description = "Yet Another DeInterlacing Filter",
+ .name = "yadif",
+ .open = vf_open,
.priv_size = sizeof(struct vf_priv_s),
.priv_defaults = &vf_priv_default,
.options = vf_opts_fields,