[FFmpeg-cvslog] Revert "avfilter/yadif: Revert "lavfi: convert input/ ouput list compound literals to named objects""

Robert Krüger git at videolan.org
Tue Jan 14 14:36:17 CET 2014


ffmpeg | branch: master | Robert Krüger <krueger at lesspain.de> | Sat Jan  4 13:50:19 2014 +0100| [61093993668bc9b377aaa8e23818a0432f280692] | committer: Michael Niedermayer

Revert "avfilter/yadif: Revert "lavfi: convert input/ouput list compound literals to named objects""

This reverts commit 4ef4bb4a203e8f472ab0484396270b9430862037.

Signed-off-by: Robert Krüger <krueger at lesspain.de>
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=61093993668bc9b377aaa8e23818a0432f280692
---

 libavfilter/vf_yadif.c |   35 +++++++++++++++++++++--------------
 1 file changed, 21 insertions(+), 14 deletions(-)

diff --git a/libavfilter/vf_yadif.c b/libavfilter/vf_yadif.c
index 1857ca9..7ffce9a 100644
--- a/libavfilter/vf_yadif.c
+++ b/libavfilter/vf_yadif.c
@@ -517,6 +517,25 @@ static const AVOption yadif_options[] = {
 
 AVFILTER_DEFINE_CLASS(yadif);
 
+static const AVFilterPad avfilter_vf_yadif_inputs[] = {
+    {
+        .name          = "default",
+        .type          = AVMEDIA_TYPE_VIDEO,
+        .filter_frame  = filter_frame,
+    },
+    { NULL }
+};
+
+static const AVFilterPad avfilter_vf_yadif_outputs[] = {
+    {
+        .name          = "default",
+        .type          = AVMEDIA_TYPE_VIDEO,
+        .request_frame = request_frame,
+        .config_props  = config_props,
+    },
+    { NULL }
+};
+
 AVFilter ff_vf_yadif = {
     .name          = "yadif",
     .description   = NULL_IF_CONFIG_SMALL("Deinterlace the input image."),
@@ -524,19 +543,7 @@ AVFilter ff_vf_yadif = {
     .priv_class    = &yadif_class,
     .uninit        = uninit,
     .query_formats = query_formats,
-
-    .inputs        = (const AVFilterPad[]) {{ .name             = "default",
-                                              .type             = AVMEDIA_TYPE_VIDEO,
-                                              .filter_frame     = filter_frame,
-                                            },
-                                            { .name = NULL}},
-
-    .outputs       = (const AVFilterPad[]) {{ .name             = "default",
-                                              .type             = AVMEDIA_TYPE_VIDEO,
-                                              .request_frame    = request_frame,
-                                              .config_props     = config_props,
-                                            },
-                                            { .name = NULL}},
-
+    .inputs        = avfilter_vf_yadif_inputs,
+    .outputs       = avfilter_vf_yadif_outputs,
     .flags         = AVFILTER_FLAG_SUPPORT_TIMELINE_INTERNAL | AVFILTER_FLAG_SLICE_THREADS,
 };



More information about the ffmpeg-cvslog mailing list