[FFmpeg-cvslog] r13340 - in trunk/libavfilter: graphparser.c graphparser.h

[vitor]

Author: vitor
Date: Sat May 24 22:41:34 2008
New Revision: 13340

Log:
Cosmetics: change function order
Commited in SoC by Vitor Sessak on 2008-05-24 12:46:27


Modified:
   trunk/libavfilter/graphparser.c
   trunk/libavfilter/graphparser.h

Modified: trunk/libavfilter/graphparser.c
==============================================================================
--- trunk/libavfilter/graphparser.c	(original)
+++ trunk/libavfilter/graphparser.c	Sat May 24 22:41:34 2008
@@ -27,41 +27,6 @@
 #include "avfilter.h"
 #include "avfiltergraph.h"
 
-static AVFilterContext *create_filter(AVFilterGraph *ctx, int index,
-                                      const char *name, const char *args,
-                                      AVClass *log_ctx)
-{
-    AVFilterContext *filt;
-
-    AVFilter *filterdef;
-    char inst_name[30];
-
-    snprintf(inst_name, sizeof(inst_name), "Parsed filter %d", index);
-
-    if(!(filterdef = avfilter_get_by_name(name))) {
-        av_log(log_ctx, AV_LOG_ERROR,
-               "no such filter: '%s'\n", name);
-        return NULL;
-    }
-
-    if(!(filt = avfilter_open(filterdef, inst_name))) {
-        av_log(log_ctx, AV_LOG_ERROR,
-               "error creating filter '%s'\n", name);
-        return NULL;
-    }
-
-    if(avfilter_graph_add_filter(ctx, filt) < 0)
-        return NULL;
-
-    if(avfilter_init_filter(filt, args, NULL)) {
-        av_log(log_ctx, AV_LOG_ERROR,
-               "error initializing filter '%s' with args '%s'\n", name, args);
-        return NULL;
-    }
-
-    return filt;
-}
-
 static int link_filter(AVFilterContext *src, int srcpad,
                        AVFilterContext *dst, int dstpad,
                        AVClass *log_ctx)
@@ -150,6 +115,41 @@ static void parse_link_name(const char *
     }
 }
 
+static AVFilterContext *create_filter(AVFilterGraph *ctx, int index,
+                                      const char *name, const char *args,
+                                      AVClass *log_ctx)
+{
+    AVFilterContext *filt;
+
+    AVFilter *filterdef;
+    char inst_name[30];
+
+    snprintf(inst_name, sizeof(inst_name), "Parsed filter %d", index);
+
+    if(!(filterdef = avfilter_get_by_name(name))) {
+        av_log(log_ctx, AV_LOG_ERROR,
+               "no such filter: '%s'\n", name);
+        return NULL;
+    }
+
+    if(!(filt = avfilter_open(filterdef, inst_name))) {
+        av_log(log_ctx, AV_LOG_ERROR,
+               "error creating filter '%s'\n", name);
+        return NULL;
+    }
+
+    if(avfilter_graph_add_filter(ctx, filt) < 0)
+        return NULL;
+
+    if(avfilter_init_filter(filt, args, NULL)) {
+        av_log(log_ctx, AV_LOG_ERROR,
+               "error initializing filter '%s' with args '%s'\n", name, args);
+        return NULL;
+    }
+
+    return filt;
+}
+
 static void free_inout(AVFilterInOut *head)
 {
     while(head) {

Modified: trunk/libavfilter/graphparser.h
==============================================================================
--- trunk/libavfilter/graphparser.h	(original)
+++ trunk/libavfilter/graphparser.h	Sat May 24 22:41:34 2008
@@ -46,9 +46,7 @@ typedef struct AVFilterInOut {
  * Add to a graph a graph described by a string.
  * @param graph   the filter graph where to link the parsed graph context
  * @param filters string to be parsed
- * @param in      input to the graph to be parsed (TODO: allow several)
- * @param inpad   pad index of the input
- * @param out     output to the graph to be parsed (TODO: allow several)
+ * @param inouts  linked list to the inputs and outputs of the graph
  * @param outpad  pad index of the output
  * @return        zero on success, -1 on error
  */