]> git.sesse.net Git - ffmpeg/blobdiff - libavfilter/avfiltergraph.c
Remove header now made useless
[ffmpeg] / libavfilter / avfiltergraph.c
index 5ff4447428f2e18988bc64826a25a5cc2642a56d..ce8d2a70e5ffa95c5ddd56447eeb1115bb257263 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Filter graphs
+ * filter graphs
  * copyright (c) 2007 Bobby Bingham
  *
  * This file is part of FFmpeg.
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include <string.h>
-#include <stddef.h>
-
-#include "avstring.h"
 #include "avfilter.h"
 #include "avfiltergraph.h"
 
-#include "allfilters.h"
+extern AVFilter avfilter_vf_scale;
+extern AVFilter avfilter_vf_graph;
+extern AVFilter avfilter_vf_graphfile;
+extern AVFilter avfilter_vf_graphdesc;
 
 typedef struct AVFilterGraph {
     unsigned filter_count;
     AVFilterContext **filters;
 
-    /** fake filter to handle links to internal filters */
-    AVFilterContext *link_filter;
+    /** fake filters to handle links to internal filters */
+    AVFilterContext *link_filter_in;
+    AVFilterContext *link_filter_out;
 } GraphContext;
 
 typedef struct {
@@ -50,7 +50,7 @@ static int link_init(AVFilterContext *ctx, const char *args, void *opaque)
 /**
  * Given the link between the dummy filter and an internal filter whose input
  * is being exported outside the graph, this returns the externally visible
- * link
+ * link.
  */
 static inline AVFilterLink *get_extern_input_link(AVFilterLink *link)
 {
@@ -58,29 +58,23 @@ static inline AVFilterLink *get_extern_input_link(AVFilterLink *link)
     return lctx->graph->inputs[link->srcpad];
 }
 
-/** query the formats supported by a filter providing input to the graph */
-static int *link_in_query_formats(AVFilterLink *link)
+/** request a frame from a filter providing input to the graph */
+static int link_in_request_frame(AVFilterLink *link)
 {
     AVFilterLink *link2 = get_extern_input_link(link);
-    int *(*query_formats)(AVFilterLink *);
 
     if(!link2)
-        return avfilter_make_format_list(0);
-
-    if(!(query_formats = link2->src->output_pads[link2->srcpad].query_formats))
-        query_formats = avfilter_default_query_output_formats;
-
-    return query_formats(link2);
+        return -1;
+    return avfilter_request_frame(link2);
 }
 
-/** request a frame from a filter providing input to the graph */
-static int link_in_request_frame(AVFilterLink *link)
+
+static int link_in_poll_frame(AVFilterLink *link)
 {
     AVFilterLink *link2 = get_extern_input_link(link);
-
     if(!link2)
         return -1;
-    return avfilter_request_frame(link2);
+    return avfilter_poll_frame(link2);
 }
 
 static int link_in_config_props(AVFilterLink *link)
@@ -104,7 +98,7 @@ static int link_in_config_props(AVFilterLink *link)
 /**
  * Given the link between the dummy filter and an internal filter whose input
  * is being exported outside the graph, this returns the externally visible
- * link
+ * link.
  */
 static inline AVFilterLink *get_extern_output_link(AVFilterLink *link)
 {
@@ -112,21 +106,9 @@ static inline AVFilterLink *get_extern_output_link(AVFilterLink *link)
     return lctx->graph->outputs[link->dstpad];
 }
 
-/** query the formats supported by a filter taking output from the graph */
-static int *link_out_query_formats(AVFilterLink *link)
-{
-    AVFilterLink *link2 = get_extern_output_link(link);
-
-    if(!link2)
-        return avfilter_make_format_list(0);
-
-    return link2->dst->input_pads[link2->dstpad].query_formats(link2);
-}
-
 static int link_out_config_props(AVFilterLink *link)
 {
     AVFilterLink *link2 = get_extern_output_link(link);
-    int (*config_props)(AVFilterLink *);
 
     if(!link2)
         return 0;
@@ -134,9 +116,7 @@ static int link_out_config_props(AVFilterLink *link)
     link2->w = link->w;
     link2->h = link->h;
 
-    if(!(config_props = link2->dst->input_pads[link2->dstpad].config_props))
-        config_props = avfilter_default_config_input_link;
-    return config_props(link2);
+    return 0;
 }
 
 static void link_out_start_frame(AVFilterLink *link, AVFilterPicRef *picref)
@@ -179,7 +159,6 @@ static void link_out_draw_slice(AVFilterLink *link, int y, int height)
 static AVFilter vf_graph_dummy =
 {
     .name      = "graph_dummy",
-    .author    = "Bobby Bingham",
 
     .priv_size = sizeof(GraphLinkContext),
 
@@ -192,7 +171,7 @@ static AVFilter vf_graph_dummy =
 static AVFilterLink *get_intern_input_link(AVFilterLink *link)
 {
     GraphContext *graph = link->dst->priv;
-    return graph->link_filter->outputs[link->dstpad];
+    return graph->link_filter_in->outputs[link->dstpad];
 }
 
 static void graph_in_start_frame(AVFilterLink *link, AVFilterPicRef *picref)
@@ -224,19 +203,11 @@ static void graph_in_draw_slice(AVFilterLink *link, int y, int height)
         avfilter_draw_slice(link2, y, height);
 }
 
-static int *graph_in_query_formats(AVFilterLink *link)
-{
-    AVFilterLink *link2 = get_intern_input_link(link);
-
-    if(!link2 || !link2->dst->input_pads[link2->dstpad].query_formats)
-        return avfilter_make_format_list(0);
-    return link2->dst->input_pads[link2->dstpad].query_formats(link2);
-}
-
 static int graph_in_config_props(AVFilterLink *link)
 {
     AVFilterLink *link2 = get_intern_input_link(link);
     int (*config_props)(AVFilterLink *);
+    int ret;
 
     if(!link2)
         return -1;
@@ -249,57 +220,56 @@ static int graph_in_config_props(AVFilterLink *link)
     if(!(config_props = link2->dst->input_pads[link2->dstpad].config_props))
         return 0;   /* FIXME? */
         //config_props = avfilter_default_config_input_link;
-    return config_props(link2);
+    if(!(ret = config_props(link2)))
+        link2->init_state = AVLINK_INIT;
+    else
+        link2->init_state = AVLINK_STARTINIT;
+
+    return ret;
 }
 
 static AVFilterLink *get_intern_output_link(AVFilterLink *link)
 {
     GraphContext *graph = link->src->priv;
-    return graph->link_filter->inputs[link->srcpad];
+    return graph->link_filter_out->inputs[link->srcpad];
 }
 
-static int *graph_out_query_formats(AVFilterLink *link)
+static int graph_out_request_frame(AVFilterLink *link)
 {
     AVFilterLink *link2 = get_intern_output_link(link);
 
-    if(!link2)
-        return avfilter_make_format_list(0);
-    if(!link2->src->output_pads[link2->srcpad].query_formats)
-        return avfilter_default_query_output_formats(link2);
-    return link2->src->output_pads[link2->srcpad].query_formats(link2);
+    if(link2)
+        return avfilter_request_frame(link2);
+    return -1;
 }
 
-static int graph_out_request_frame(AVFilterLink *link)
+static int graph_out_poll_frame(AVFilterLink *link)
 {
     AVFilterLink *link2 = get_intern_output_link(link);
 
-    if(link2)
-        return avfilter_request_frame(link2);
-    return -1;
+    if(!link2)
+        return -1;
+
+    return avfilter_poll_frame(link2);
 }
 
 static int graph_out_config_props(AVFilterLink *link)
 {
-    AVFilterLink *link2 = get_intern_output_link(link);
-    int (*config_props)(AVFilterLink *);
+    GraphContext *graph = link->src->priv;
+    AVFilterLink *link2 = graph->link_filter_out->inputs[link->srcpad];
     int ret;
 
+    if((ret = avfilter_config_links(graph->link_filter_out)))
+        return ret;
+
     if(!link2)
         return 0;
 
-    link2->w = link->w;
-    link2->h = link->h;
-    link2->format = link->format;
-
-    if(!(config_props = link2->src->output_pads[link2->srcpad].config_props))
-        config_props = avfilter_default_config_output_link;
-    ret = config_props(link2);
-
     link->w = link2->w;
     link->h = link2->h;
     link->format = link2->format;
 
-    return ret;
+    return 0;
 }
 
 static int add_graph_input(AVFilterContext *gctx, AVFilterContext *filt, unsigned idx,
@@ -310,29 +280,28 @@ static int add_graph_input(AVFilterContext *gctx, AVFilterContext *filt, unsigne
     AVFilterPad graph_inpad =
     {
         .name             = name,
-        .type             = AV_PAD_VIDEO,
+        .type             = CODEC_TYPE_VIDEO,
         .start_frame      = graph_in_start_frame,
         .end_frame        = graph_in_end_frame,
         .get_video_buffer = graph_in_get_video_buffer,
         .draw_slice       = graph_in_draw_slice,
-        .query_formats    = graph_in_query_formats,
         .config_props     = graph_in_config_props,
         /* XXX */
     };
     AVFilterPad dummy_outpad =
     {
         .name          = NULL,          /* FIXME? */
-        .type          = AV_PAD_VIDEO,
-        .query_formats = link_in_query_formats,
+        .type          = CODEC_TYPE_VIDEO,
         .request_frame = link_in_request_frame,
+        .poll_frame    = link_in_poll_frame,
         .config_props  = link_in_config_props,
     };
 
     avfilter_insert_inpad (gctx, gctx->input_count, &graph_inpad);
-    avfilter_insert_outpad(graph->link_filter, graph->link_filter->output_count,
+    avfilter_insert_outpad(graph->link_filter_in, graph->link_filter_in->output_count,
                            &dummy_outpad);
-    return avfilter_link(graph->link_filter,
-                         graph->link_filter->output_count-1, filt, idx);
+    return avfilter_link(graph->link_filter_in,
+                         graph->link_filter_in->output_count-1, filt, idx);
 }
 
 static int add_graph_output(AVFilterContext *gctx, AVFilterContext *filt, unsigned idx,
@@ -343,37 +312,40 @@ static int add_graph_output(AVFilterContext *gctx, AVFilterContext *filt, unsign
     AVFilterPad graph_outpad =
     {
         .name             = name,
-        .type             = AV_PAD_VIDEO,
+        .type             = CODEC_TYPE_VIDEO,
         .request_frame    = graph_out_request_frame,
-        .query_formats    = graph_out_query_formats,
+        .poll_frame       = graph_out_poll_frame,
         .config_props     = graph_out_config_props,
     };
     AVFilterPad dummy_inpad =
     {
         .name             = NULL,          /* FIXME? */
-        .type             = AV_PAD_VIDEO,
+        .type             = CODEC_TYPE_VIDEO,
         .start_frame      = link_out_start_frame,
         .end_frame        = link_out_end_frame,
         .draw_slice       = link_out_draw_slice,
         .get_video_buffer = link_out_get_video_buffer,
-        .query_formats    = link_out_query_formats,
         .config_props     = link_out_config_props,
     };
 
     avfilter_insert_outpad(gctx, gctx->output_count, &graph_outpad);
-    avfilter_insert_inpad (graph->link_filter, graph->link_filter->input_count,
+    avfilter_insert_inpad (graph->link_filter_out, graph->link_filter_out->input_count,
                            &dummy_inpad);
-    return avfilter_link(filt, idx, graph->link_filter,
-                         graph->link_filter->input_count-1);
+    return avfilter_link(filt, idx, graph->link_filter_out,
+                         graph->link_filter_out->input_count-1);
 }
 
 static void uninit(AVFilterContext *ctx)
 {
     GraphContext *graph = ctx->priv;
 
-    if(graph->link_filter) {
-        avfilter_destroy(graph->link_filter);
-        graph->link_filter = NULL;
+    if(graph->link_filter_in) {
+        avfilter_destroy(graph->link_filter_in);
+        graph->link_filter_in = NULL;
+    }
+    if(graph->link_filter_out) {
+        avfilter_destroy(graph->link_filter_out);
+        graph->link_filter_out = NULL;
     }
     for(; graph->filter_count > 0; graph->filter_count --)
         avfilter_destroy(graph->filters[graph->filter_count - 1]);
@@ -406,174 +378,121 @@ AVFilterContext *avfilter_graph_get_filter(AVFilterContext *ctx, char *name)
     return NULL;
 }
 
-int avfilter_graph_config_links(AVFilterContext *graphctx)
+static int query_formats(AVFilterContext *graphctx)
 {
     GraphContext *graph = graphctx->priv;
+    AVFilterContext *linkfiltin  = graph->link_filter_in;
+    AVFilterContext *linkfiltout = graph->link_filter_out;
     int i, j;
 
+    /* ask all the sub-filters for their supported colorspaces */
     for(i = 0; i < graph->filter_count; i ++) {
-        for(j = 0; j < graph->filters[i]->input_count; j ++) {
-            /* ensure that graphs contained within graphs are configured */
-            if((graph->filters[i]->filter == &avfilter_vf_graph     ||
-                graph->filters[i]->filter == &avfilter_vf_graphfile ||
-                graph->filters[i]->filter == &avfilter_vf_graphdesc) &&
-                avfilter_graph_config_links(graph->filters[i]))
-                return -1;
-            if(avfilter_config_link(graph->filters[i]->inputs[j]))
-                return -1;
-        }
+        if(graph->filters[i]->filter->query_formats)
+            graph->filters[i]->filter->query_formats(graph->filters[i]);
+        else
+            avfilter_default_query_formats(graph->filters[i]);
     }
 
-    return 0;
-}
-
-static AVFilterContext *create_filter_with_args(const char *filt, void *opaque)
-{
-    AVFilterContext *ret;
-    char *filter = av_strdup(filt); /* copy - don't mangle the input string */
-    char *name, *args;
-
-    name = filter;
-    if((args = strchr(filter, '='))) {
-        /* ensure we at least have a name */
-        if(args == filter)
-            goto fail;
+    /* use these formats on our exported links */
+    for(i = 0; i < linkfiltout->input_count; i ++) {
+        avfilter_formats_ref( linkfiltout->inputs[i]->in_formats,
+                             &linkfiltout->inputs[i]->out_formats);
 
-        *args ++ = 0;
+        if(graphctx->outputs[i])
+            avfilter_formats_ref(linkfiltout->inputs[i]->in_formats,
+                                 &graphctx->outputs[i]->in_formats);
     }
+    for(i = 0; i < linkfiltin->output_count; i ++) {
+        avfilter_formats_ref( linkfiltin->outputs[i]->out_formats,
+                             &linkfiltin->outputs[i]->in_formats);
 
-    av_log(NULL, AV_LOG_INFO, "creating filter \"%s\" with args \"%s\"\n",
-           name, args ? args : "(none)");
-
-    if((ret = avfilter_open(avfilter_get_by_name(name), NULL))) {
-        if(avfilter_init_filter(ret, args, opaque)) {
-            av_log(NULL, AV_LOG_ERROR, "error initializing filter!\n");
-            avfilter_destroy(ret);
-            goto fail;
-        }
-    } else {
-        av_log(NULL, AV_LOG_ERROR,
-               "error creating filter \"%s\" with args \"%s\"\n",
-               name, args ? args : "(none)");
-        return NULL;
+        if(graphctx->inputs[i])
+            avfilter_formats_ref(linkfiltin->outputs[i]->out_formats,
+                                 &graphctx-> inputs[i]->out_formats);
     }
 
-    av_free(filter);
-
-    return ret;
-
-fail:
-    av_free(filter);
-    return NULL;
-}
-
-static int graph_load_chain(AVFilterContext *graphctx,
-                              unsigned count, char **filter_list, void **opaque,
-                              AVFilterContext **first, AVFilterContext **last)
-{
-    unsigned i;
-    AVFilterContext *filters[2] = {NULL,NULL};
-
-    for(i = 0; i < count; i ++) {
-        void *op;
-
-        if(opaque) op = opaque[i];
-        else       op = NULL;
-
-        if(!(filters[1] = create_filter_with_args(filter_list[i], op)))
-            goto fail;
-        if(i == 0) {
-            if(first) *first = filters[1];
-        } else {
-            if(avfilter_link(filters[0], 0, filters[1], 0)) {
-                av_log(NULL, AV_LOG_ERROR, "error linking filters!\n");
-                goto fail;
+    /* go through and merge as many format lists as possible */
+    for(i = 0; i < graph->filter_count; i ++) {
+        AVFilterContext *filter = graph->filters[i];
+
+        for(j = 0; j < filter->input_count; j ++) {
+            AVFilterLink *link;
+            if(!(link = filter->inputs[j]))
+                continue;
+            if(link->in_formats != link->out_formats) {
+                if(!avfilter_merge_formats(link->in_formats,
+                                           link->out_formats)) {
+                    /* couldn't merge format lists. auto-insert scale filter */
+                    AVFilterContext *scale;
+
+                    if(!(scale = avfilter_open(&avfilter_vf_scale, NULL)))
+                        return -1;
+                    if(scale->filter->init(scale, NULL, NULL) ||
+                       avfilter_insert_filter(link, scale, 0, 0)) {
+                        avfilter_destroy(scale);
+                        return -1;
+                    }
+
+                    avfilter_graph_add_filter(graphctx, scale);
+                    scale->filter->query_formats(scale);
+                    if(!avfilter_merge_formats(scale-> inputs[0]->in_formats,
+                                              scale-> inputs[0]->out_formats) ||
+                       !avfilter_merge_formats(scale->outputs[0]->in_formats,
+                                              scale->outputs[0]->out_formats))
+                        return -1;
+                }
             }
         }
-        avfilter_graph_add_filter(graphctx, filters[1]);
-        if(i == 0 && filters[1]->input_count > 0)
-            add_graph_input(graphctx, filters[1], 0, "default");
-        filters[0] = filters[1];
     }
 
-    if(filters[1]->output_count > 0)
-        add_graph_output(graphctx, filters[1], 0, "default");
-
-    if(last) *last = filters[1];
     return 0;
-
-fail:
-    uninit(graphctx);
-    if(first) *first = NULL;
-    if(last)  *last  = NULL;
-    return -1;
 }
 
-static int graph_load_chain_from_string(AVFilterContext *ctx, const char *str,
-                                        AVFilterContext **first,
-                                        AVFilterContext **last)
+static void pick_format(AVFilterLink *link)
 {
-    int count, ret = 0;
-    char **strings;
-    char *filt;
-
-    strings    = av_malloc(sizeof(char *));
-    strings[0] = av_strdup(str);
-
-    filt = strchr(strings[0], ',');
-    for(count = 1; filt; count ++) {
-        if(filt == strings[count-1]) {
-            ret = -1;
-            goto done;
-        }
+    if(!link || !link->in_formats)
+        return;
 
-        strings = av_realloc(strings, sizeof(char *) * (count+1));
-        strings[count] = filt + 1;
-        *filt = '\0';
-        filt = strchr(strings[count], ',');
-    }
-
-    ret = graph_load_chain(ctx, count, strings, NULL, first, last);
-
-done:
-    av_free(strings[0]);
-    av_free(strings);
+    link->in_formats->format_count = 1;
+    link->format = link->in_formats->formats[0];
 
-    return ret;
+    avfilter_formats_unref(&link->in_formats);
+    avfilter_formats_unref(&link->out_formats);
 }
 
-static int init(AVFilterContext *ctx, const char *args, void *opaque)
+static void pick_formats(GraphContext *graph)
 {
-    GraphContext *gctx = ctx->priv;
-
-    if(!(gctx->link_filter = avfilter_open(&vf_graph_dummy, NULL)))
-        return -1;
-    if(avfilter_init_filter(gctx->link_filter, NULL, ctx))
-        goto fail;
+    int i, j;
 
-    if(!args)
-        return 0;
+    for(i = 0; i < graph->filter_count; i ++) {
+        AVFilterContext *filter = graph->filters[i];
 
-    return graph_load_chain_from_string(ctx, args, NULL, NULL);
+        if(filter->filter == &avfilter_vf_graph     ||
+           filter->filter == &avfilter_vf_graphfile ||
+           filter->filter == &avfilter_vf_graphdesc)
+            pick_formats(filter->priv);
 
-fail:
-    avfilter_destroy(gctx->link_filter);
-    return -1;
+        for(j = 0; j < filter->input_count; j ++)
+            pick_format(filter->inputs[j]);
+        for(j = 0; j < filter->output_count; j ++)
+            pick_format(filter->outputs[j]);
+    }
 }
 
-AVFilter avfilter_vf_graph =
+int avfilter_graph_config_formats(AVFilterContext *graphctx)
 {
-    .name      = "graph",
-    .author    = "Bobby Bingham",
+    GraphContext *graph = graphctx->priv;
 
-    .priv_size = sizeof(GraphContext),
+    /* find supported formats from sub-filters, and merge along links */
+    if(query_formats(graphctx))
+        return -1;
 
-    .init      = init,
-    .uninit    = uninit,
+    /* Once everything is merged, it's possible that we'll still have
+     * multiple valid choices of colorspace. We pick the first one. */
+    pick_formats(graph);
 
-    .inputs    = (AVFilterPad[]) {{ .name = NULL, }},
-    .outputs   = (AVFilterPad[]) {{ .name = NULL, }},
-};
+    return 0;
+}
 
 static int graph_load_from_desc(AVFilterContext *ctx, AVFilterGraphDesc *desc)
 {
@@ -588,12 +507,14 @@ static int graph_load_from_desc(AVFilterContext *ctx, AVFilterGraphDesc *desc)
     for(curfilt = desc->filters; curfilt; curfilt = curfilt->next) {
         if(!(filterdef = avfilter_get_by_name(curfilt->filter)) ||
            !(filt = avfilter_open(filterdef, curfilt->name))) {
-            av_log(ctx, AV_LOG_ERROR, "error creating filter\n");
+            av_log(ctx, AV_LOG_ERROR,
+               "error creating filter '%s'\n", curfilt->name);
             goto fail;
         }
         avfilter_graph_add_filter(ctx, filt);
         if(avfilter_init_filter(filt, curfilt->args, NULL)) {
-            av_log(ctx, AV_LOG_ERROR, "error initializing filter\n");
+            av_log(ctx, AV_LOG_ERROR,
+                "error initializing filter '%s'\n", curfilt->name);
             goto fail;
         }
     }
@@ -639,6 +560,53 @@ fail:
     return -1;
 }
 
+static int init(AVFilterContext *ctx, const char *args, void *opaque)
+{
+    GraphContext *gctx = ctx->priv;
+    AVFilterGraphDesc *desc;
+    int ret;
+
+    if(!(gctx->link_filter_in = avfilter_open(&vf_graph_dummy, NULL)))
+        return -1;
+    if(avfilter_init_filter(gctx->link_filter_in, NULL, ctx))
+        goto fail;
+    if(!(gctx->link_filter_out = avfilter_open(&vf_graph_dummy, NULL)))
+        goto fail;
+    if(avfilter_init_filter(gctx->link_filter_out, NULL, ctx))
+        goto fail;
+
+    if(!args)
+        return 0;
+
+    if(!(desc = avfilter_graph_parse_chain(args)))
+        goto fail;
+
+    ret = graph_load_from_desc(ctx, desc);
+    avfilter_graph_free_desc(desc);
+    return ret;
+
+fail:
+    avfilter_destroy(gctx->link_filter_in);
+    if(gctx->link_filter_out)
+        avfilter_destroy(gctx->link_filter_out);
+    return -1;
+}
+
+AVFilter avfilter_vf_graph =
+{
+    .name      = "graph",
+
+    .priv_size = sizeof(GraphContext),
+
+    .init      = init,
+    .uninit    = uninit,
+
+    .query_formats = query_formats,
+
+    .inputs    = (AVFilterPad[]) {{ .name = NULL, }},
+    .outputs   = (AVFilterPad[]) {{ .name = NULL, }},
+};
+
 static int init_desc(AVFilterContext *ctx, const char *args, void *opaque)
 {
     GraphContext *gctx = ctx->priv;
@@ -646,28 +614,35 @@ static int init_desc(AVFilterContext *ctx, const char *args, void *opaque)
     if(!opaque)
         return -1;
 
-    if(!(gctx->link_filter = avfilter_open(&vf_graph_dummy, NULL)))
+    if(!(gctx->link_filter_in = avfilter_open(&vf_graph_dummy, NULL)))
         return -1;
-    if(avfilter_init_filter(gctx->link_filter, NULL, ctx))
+    if(avfilter_init_filter(gctx->link_filter_in, NULL, ctx))
+        goto fail;
+    if(!(gctx->link_filter_out = avfilter_open(&vf_graph_dummy, NULL)))
+        goto fail;
+    if(avfilter_init_filter(gctx->link_filter_out, NULL, ctx))
         goto fail;
 
     return graph_load_from_desc(ctx, opaque);
 
 fail:
-    avfilter_destroy(gctx->link_filter);
+    avfilter_destroy(gctx->link_filter_in);
+    if(gctx->link_filter_out)
+        avfilter_destroy(gctx->link_filter_out);
     return -1;
 }
 
 AVFilter avfilter_vf_graphdesc =
 {
     .name      = "graph_desc",
-    .author    = "Bobby Bingham",
 
     .priv_size = sizeof(GraphContext),
 
     .init      = init_desc,
     .uninit    = uninit,
 
+    .query_formats = query_formats,
+
     .inputs    = (AVFilterPad[]) {{ .name = NULL, }},
     .outputs   = (AVFilterPad[]) {{ .name = NULL, }},
 };
@@ -690,13 +665,14 @@ static int init_file(AVFilterContext *ctx, const char *args, void *opaque)
 AVFilter avfilter_vf_graphfile =
 {
     .name      = "graph_file",
-    .author    = "Bobby Bingham",
 
     .priv_size = sizeof(GraphContext),
 
     .init      = init_file,
     .uninit    = uninit,
 
+    .query_formats = query_formats,
+
     .inputs    = (AVFilterPad[]) {{ .name = NULL, }},
     .outputs   = (AVFilterPad[]) {{ .name = NULL, }},
 };