Use link_filter() instead avfilter_link() when clearer
authorVitor Sessak <vitor1001@gmail.com>
Sat, 24 May 2008 20:39:03 +0000 (20:39 +0000)
committerVitor Sessak <vitor1001@gmail.com>
Sat, 24 May 2008 20:39:03 +0000 (20:39 +0000)
Commited in SoC by Vitor Sessak on 2008-04-06 18:17:29

Originally committed as revision 13290 to svn://svn.ffmpeg.org/ffmpeg/trunk

libavfilter/graphparser.c

index be61c27081b7e1feda1bf98f9d9244570b5d68b4..f76883d9b64643edc219d7b97661a2319b3b7c07 100644 (file)
@@ -294,10 +294,8 @@ int avfilter_graph_parse_chain(AVFilterGraph *graph, const char *filters, AVFilt
         // If the first filter has an input and none was given, it is
         // implicitly the input of the whole graph.
         if (pad == 0 && graph->filters[graph->filter_count-1]->input_count == 1) {
-            if(avfilter_link(in, inpad, filter, 0)) {
-                av_log(&log_ctx, AV_LOG_ERROR, "cannot create link between source and destination filters\n");
+            if(link_filter(in, inpad, filter, 0))
                 goto fail;
-            }
         }
 
         if(chr == ',') {
@@ -317,17 +315,14 @@ int avfilter_graph_parse_chain(AVFilterGraph *graph, const char *filters, AVFilt
             continue; // Already processed
 
         if (!strcmp(inout->name, "in")) {
-            if(avfilter_link(in, inpad, inout->instance, inout->pad_idx)) {
-                av_log(&log_ctx, AV_LOG_ERROR, "cannot create link between source and destination filters\n");
+            if(link_filter(in, inpad, inout->instance, inout->pad_idx))
                 goto fail;
-            }
+
         } else if (!strcmp(inout->name, "out")) {
             has_out = 1;
 
-            if(avfilter_link(inout->instance, inout->pad_idx, out, outpad)) {
-                av_log(&log_ctx, AV_LOG_ERROR, "cannot create link between source and destination filters\n");
+            if(link_filter(inout->instance, inout->pad_idx, out, outpad))
                 goto fail;
-            }
 
         } else {
             AVFilterInOut *p, *src, *dst;
@@ -363,11 +358,8 @@ int avfilter_graph_parse_chain(AVFilterGraph *graph, const char *filters, AVFilt
     free_inout(head);
 
     if (!has_out) {
-        if(avfilter_link(last_filt, pad, out, outpad)) {
-            av_log(&log_ctx, AV_LOG_ERROR, "cannot create link between source and destination filters\n");
+        if(link_filter(last_filt, pad, out, outpad))
             goto fail;
-        }
-
     }
 
     return 0;