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.

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;

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;
+    int (*open)(struct vf_instance *vf, char *args);
-    const char *comment;
-    int (*vf_open)(struct vf_instance *vf, char *args);
     void *damn_you;
     int priv_size;
     const void *priv_defaults;

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",
+    .description = "cropping",
-    "crop",
+    .name = "crop",
-    "A'rpi",
+    .open = vf_open,
-    "",
-    vf_open,
     .priv_size = sizeof(struct vf_priv_s),
     .priv_defaults = &vf_priv_dflt,
     .options = vf_opts_fields,

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",
+    .description = "simple logo remover",
-    "delogo",
+    .name = "delogo",
-    "Jindrich Makovicka, Alex Beregszaszi",
+    .open = vf_open,
-    "",
-    vf_open,
     .priv_size = sizeof(struct vf_priv_s),
     .priv_defaults = &vf_priv_dflt,
     .options = vf_opts_fields,

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",
+   .description = "inverse telecine for deinterlaced video",
-   "divtc",
+   .name = "divtc",
-   "Ville Saari",
+   .open = vf_open,
-   "",
-   vf_open,
-   NULL
    };

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",
+    .description = "Dynamic library filter",
-    "dlopen",
+    .name = "dlopen",
-    "Rudolf Polzer",
+    .open = vf_open,
-    "",
-    vf_open,
     .priv_size = sizeof(struct vf_priv_s),
     .priv_defaults = &vf_priv_dflt,
     .options = vf_opts_fields,

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",
+    .description = "convert stereo movie from top-bottom to left-right field",
-	"down3dright",
+    .name = "down3dright",
-	"Zdenek Kabelac",
+    .open = vf_open,
-	"",
-	vf_open,
-	NULL
 };

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",
+    .description = "reset displaysize/aspect",
-    "dsize",
+    .name = "dsize",
-    "Rich Felker",
+    .open = vf_open,
-    "",
-    vf_open,
-    NULL
 };

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",
+    .description = "Software equalizer",
-  "eq",
+    .name = "eq",
-  "Hampa Hug, Daniel Moreno, Richard Felker",
+    .open = &vf_open,
-  "",
-  &vf_open,
-  NULL
 };

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",
+    .description = "expanding",
-    "expand",
+    .name = "expand",
-    "A'rpi",
+    .open = vf_open,
-    "",
-    vf_open,
     .priv_size = sizeof(struct vf_priv_s),
     .priv_defaults = &vf_priv_dflt,
     .options = vf_opts_fields,

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",
+    .description = "flip image upside-down",
-    "flip",
+    .name = "flip",
-    "A'rpi",
+    .open = vf_open,
-    "",
-    vf_open,
-    NULL
 };
 
 //===========================================================================//

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",
+    .description = "force output format",
-    "format",
+    .name = "format",
-    "A'rpi",
+    .open = vf_open,
-    "FIXME! get_image()/put_image()",
-    vf_open,
     .priv_size = sizeof(struct vf_priv_s),
     .priv_defaults = &vf_priv_dflt,
     .options = vf_opts_fields,

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",
+    .description = "gradient deband",
-    "gradfun",
+    .name = "gradfun",
-    "Loren Merritt",
+    .open = vf_open,
-    "",
-    vf_open,
     .priv_size = sizeof(struct vf_priv_s),
     .priv_defaults = &vf_priv_dflt,
     .options = vf_opts_fields,

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",
+    .description = "High Quality 3D Denoiser",
-    "hqdn3d",
+    .name = "hqdn3d",
-    "Daniel Moreno & A'rpi",
+    .open = vf_open,
-    "",
-    vf_open,
-    NULL
 };
 
 //===========================================================================//

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",
+    .description = "4:2:0 planar -> 4:2:2 packed reinterlacer",
-    "ilpack",
+    .name = "ilpack",
-    "Richard Felker",
+    .open = vf_open,
-    "",
-    vf_open,
-    NULL
 };

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",
+    .description = "libavfilter bridge",
-    "lavfi",
+    .name = "lavfi",
-    "",
+    .open = vf_open,
-    "",
-    vf_open,
     .priv_size = sizeof(struct vf_priv_s),
     .priv_defaults = &vf_priv_dflt,
     .options = vf_opts_fields,

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",
+    .description = "horizontal mirror",
-    "mirror",
+    .name = "mirror",
-    "Eyck",
+    .open = vf_open,
-    "",
-    vf_open,
-    NULL
 };
 
 //===========================================================================//

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",
+    .description = "disallow one output format",
-    "noformat",
+    .name = "noformat",
-    "Joey",
+    .open = vf_open,
-    "",
-    vf_open,
     .priv_size = sizeof(struct vf_priv_s),
     .priv_defaults = &vf_priv_dflt,
     .options = vf_opts_fields,

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",
+    .description = "noise generator",
-    "noise",
+    .name = "noise",
-    "Michael Niedermayer",
+    .open = vf_open,
-    "",
-    vf_open,
-    NULL
 };
 
 //===========================================================================//

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",
+   .description = "phase shift fields",
-   "phase",
+   .name = "phase",
-   "Ville Saari",
+   .open = vf_open,
-   "",
-   vf_open,
-   NULL
    };

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",
+    .description = "postprocessing",
-    "pp",
+    .name = "pp",
-    "A'rpi",
+    .open = vf_open,
-    "",
-    vf_open,
-    NULL
 };
 
 //===========================================================================//

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)",
+    .description = "pullup (from field sequence to frames)",
-    "pullup",
+    .name = "pullup",
-    "Rich Felker",
+    .open = vf_open,
-    "",
-    vf_open,
-    NULL
 };

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",
+    .description = "rotate",
-    "rotate",
+    .name = "rotate",
-    "A'rpi",
+    .open = vf_open,
-    "",
-    vf_open,
-    NULL
 };
 
 //===========================================================================//

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",
+    .description = "software scaling",
-    "scale",
+    .name = "scale",
-    "A'rpi",
+    .open = vf_open,
-    "",
-    vf_open,
     .priv_size = sizeof(struct vf_priv_s),
     .priv_defaults = &vf_priv_dflt,
     .options = vf_opts_fields,

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",
+    .description = "screenshot to file",
-    "screenshot",
+    .name = "screenshot",
-    "A'rpi, Jindrich Makovicka",
+    .open = vf_open,
-    "",
-    vf_open,
-    NULL
 };

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",
+    .description = "mpeg2 soft 3:2 pulldown",
-    "softpulldown",
+    .name = "softpulldown",
-    "Tobias Diedrich <ranma+mplayer@tdiedrich.de>",
+    .open = vf_open,
-    "",
-    vf_open,
-    NULL
 };

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",
+    .description = "stereoscopic 3d view",
-    "stereo3d",
+    .name = "stereo3d",
-    "Gordon Schmidt",
+    .open = vf_open,
-    "view stereoscopic videos",
-    vf_open,
     .priv_size = sizeof(struct vf_priv_s),
     .priv_defaults = &vf_priv_default,
     .options = vf_opts_fields,

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",
+    .description = "Render subtitles",
-    "sub",
+    .name = "sub",
-    "Evgeniy Stepanov",
+    .open = vf_open,
-    "",
-    vf_open,
     .priv_size = sizeof(struct vf_priv_s),
     .priv_defaults = &vf_priv_dflt,
     .options = vf_opts_fields,

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",
+    .description = "UV swapper",
-    "swapuv",
+    .name = "swapuv",
-    "Michael Niedermayer",
+    .open = vf_open,
-    "",
-    vf_open,
-    NULL
 };
 
 //===========================================================================//

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",
+    .description = "unsharp mask & gaussian blur",
-    "unsharp",
+    .name = "unsharp",
-    "Remi Guyomarch",
+    .open = vf_open,
-    "",
-    vf_open,
-    NULL
 };
 
 //===========================================================================//

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",
+    .open = vf_open,
-    .comment = "",
-    .vf_open = vf_open,
     .priv_size = sizeof(struct vf_priv_s),
     .priv_defaults = &vf_priv_default,
     .options = vf_opts_fields,

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",
+    .description = "libvo wrapper",
-    "vo",
+    .name = "vo",
-    "A'rpi",
+    .open = vf_open,
-    "for internal use",
-    vf_open,
-    NULL
 };

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",
+    .description = "Yet Another DeInterlacing Filter",
-    "yadif",
+    .name = "yadif",
-    "Michael Niedermayer",
+    .open = vf_open,
-    "",
-    vf_open,
     .priv_size = sizeof(struct vf_priv_s),
     .priv_defaults = &vf_priv_default,
     .options = vf_opts_fields,