Add avfilter_graph_create_filter().

[ffmpeg] / libavfilter / avfiltergraph.c

diff --git a/libavfilter/avfiltergraph.c b/libavfilter/avfiltergraph.c
index 97dd120d89c384c45d4ff44e5af38890c12b3b1d..8a258912df4a093b7edaca2c55a4cc77a5d1c593 100644 (file)
--- a/libavfilter/avfiltergraph.c
+++ b/libavfilter/avfiltergraph.c
@@ -53,6 +53,27 @@ int avfilter_graph_add_filter(AVFilterGraph *graph, AVFilterContext *filter)
     return 0;
 }
 
+int avfilter_graph_create_filter(AVFilterContext **filt_ctx, AVFilter *filt,
+                                 const char *name, const char *args, void *opaque,
+                                 AVFilterGraph *graph_ctx)
+{
+    int ret;
+
+    if ((ret = avfilter_open(filt_ctx, filt, name)) < 0)
+        goto fail;
+    if ((ret = avfilter_init_filter(*filt_ctx, args, opaque)) < 0)
+        goto fail;
+    if ((ret = avfilter_graph_add_filter(graph_ctx, *filt_ctx)) < 0)
+        goto fail;
+    return 0;
+
+fail:
+    if (*filt_ctx)
+        avfilter_free(*filt_ctx);
+    *filt_ctx = NULL;
+    return ret;
+}
+
 int ff_avfilter_graph_check_validity(AVFilterGraph *graph, AVClass *log_ctx)
 {
     AVFilterContext *filt;
@@ -113,7 +134,7 @@ AVFilterContext *avfilter_graph_get_filter(AVFilterGraph *graph, char *name)
 
 static int query_formats(AVFilterGraph *graph, AVClass *log_ctx)
 {
-    int i, j;
+    int i, j, ret;
     int scaler_count = 0;
     char inst_name[30];
 
@@ -139,17 +160,12 @@ static int query_formats(AVFilterGraph *graph, AVClass *log_ctx)
                     /* couldn't merge format lists. auto-insert scale filter */
                     snprintf(inst_name, sizeof(inst_name), "auto-inserted scaler %d",
                              scaler_count++);
-                    avfilter_open(&scale, avfilter_get_by_name("scale"), inst_name);
-
                     snprintf(scale_args, sizeof(scale_args), "0:0:%s", graph->scale_sws_opts);
-                    if(!scale || scale->filter->init(scale, scale_args, NULL) ||
-                                 avfilter_insert_filter(link, scale, 0, 0)) {
-                        avfilter_free(scale);
-                        return -1;
-                    }
-
-                    if (avfilter_graph_add_filter(graph, scale) < 0)
-                        return -1;
+                    if ((ret = avfilter_graph_create_filter(&scale, avfilter_get_by_name("scale"),
+                                                            inst_name, scale_args, NULL, graph)) < 0)
+                        return ret;
+                    if ((ret = avfilter_insert_filter(link, scale, 0, 0)) < 0)
+                        return ret;
 
                     scale->filter->query_formats(scale);
                     if (((link = scale-> inputs[0]) &&