[FFmpeg-cvslog] r24418 - trunk/libavfilter/graphparser.c

stefano subversion
Thu Jul 22 11:49:16 CEST 2010


Author: stefano
Date: Thu Jul 22 11:49:15 2010
New Revision: 24418

Log:
Fix style: "if(" -> "if (".

Modified:
   trunk/libavfilter/graphparser.c

Modified: trunk/libavfilter/graphparser.c
==============================================================================
--- trunk/libavfilter/graphparser.c	Thu Jul 22 09:24:22 2010	(r24417)
+++ trunk/libavfilter/graphparser.c	Thu Jul 22 11:49:15 2010	(r24418)
@@ -34,7 +34,7 @@ static int link_filter(AVFilterContext *
                        AVFilterContext *dst, int dstpad,
                        AVClass *log_ctx)
 {
-    if(avfilter_link(src, srcpad, dst, dstpad)) {
+    if (avfilter_link(src, srcpad, dst, dstpad)) {
         av_log(log_ctx, AV_LOG_ERROR,
                "cannot create the link %s:%d -> %s:%d\n",
                src->filter->name, srcpad, dst->filter->name, dstpad);
@@ -57,13 +57,13 @@ static char *parse_link_name(const char 
 
     name = av_get_token(buf, "]");
 
-    if(!name[0]) {
+    if (!name[0]) {
         av_log(log_ctx, AV_LOG_ERROR,
                "Bad (empty?) label found in the following: \"%s\".\n", start);
         goto fail;
     }
 
-    if(*(*buf)++ != ']') {
+    if (*(*buf)++ != ']') {
         av_log(log_ctx, AV_LOG_ERROR,
                "Mismatched '[' found in the following: \"%s\".\n", start);
     fail:
@@ -87,20 +87,20 @@ static AVFilterContext *create_filter(AV
 
     filt = avfilter_get_by_name(filt_name);
 
-    if(!filt) {
+    if (!filt) {
         av_log(log_ctx, AV_LOG_ERROR,
                "no such filter: '%s'\n", filt_name);
         return NULL;
     }
 
     filt_ctx = avfilter_open(filt, inst_name);
-    if(!filt_ctx) {
+    if (!filt_ctx) {
         av_log(log_ctx, AV_LOG_ERROR,
                "error creating filter '%s'\n", filt_name);
         return NULL;
     }
 
-    if(avfilter_graph_add_filter(ctx, filt_ctx) < 0) {
+    if (avfilter_graph_add_filter(ctx, filt_ctx) < 0) {
         avfilter_destroy(filt_ctx);
         return NULL;
     }
@@ -111,7 +111,7 @@ static AVFilterContext *create_filter(AV
         args = tmp_args;
     }
 
-    if(avfilter_init_filter(filt_ctx, args, NULL)) {
+    if (avfilter_init_filter(filt_ctx, args, NULL)) {
         av_log(log_ctx, AV_LOG_ERROR,
                "error initializing filter '%s' with args '%s'\n", filt_name, args);
         return NULL;
@@ -130,7 +130,7 @@ static AVFilterContext *parse_filter(con
     char *name = av_get_token(buf, "=,;[\n");
     AVFilterContext *ret;
 
-    if(**buf == '=') {
+    if (**buf == '=') {
         (*buf)++;
         opts = av_get_token(buf, "[],;\n");
     }
@@ -143,7 +143,7 @@ static AVFilterContext *parse_filter(con
 
 static void free_inout(AVFilterInOut *head)
 {
-    while(head) {
+    while (head) {
         AVFilterInOut *next = head->next;
         av_free(head->name);
         av_free(head);
@@ -155,12 +155,12 @@ static AVFilterInOut *extract_inout(cons
 {
     AVFilterInOut *ret;
 
-    while(*links && strcmp((*links)->name, label))
+    while (*links && strcmp((*links)->name, label))
         links = &((*links)->next);
 
     ret = *links;
 
-    if(ret)
+    if (ret)
         *links = ret->next;
 
     return ret;
@@ -178,9 +178,9 @@ static int link_filter_inouts(AVFilterCo
 {
     int pad = filter->input_count;
 
-    while(pad--) {
+    while (pad--) {
         AVFilterInOut *p = *curr_inputs;
-        if(!p) {
+        if (!p) {
             av_log(log_ctx, AV_LOG_ERROR,
                    "Not enough inputs specified for the \"%s\" filter.\n",
                    filter->filter->name);
@@ -189,8 +189,8 @@ static int link_filter_inouts(AVFilterCo
 
         *curr_inputs = (*curr_inputs)->next;
 
-        if(p->filter) {
-            if(link_filter(p->filter, p->pad_idx, filter, pad, log_ctx))
+        if (p->filter) {
+            if (link_filter(p->filter, p->pad_idx, filter, pad, log_ctx))
                 return -1;
             av_free(p->name);
             av_free(p);
@@ -201,7 +201,7 @@ static int link_filter_inouts(AVFilterCo
         }
     }
 
-    if(*curr_inputs) {
+    if (*curr_inputs) {
         av_log(log_ctx, AV_LOG_ERROR,
                "Too many inputs specified for the \"%s\" filter.\n",
                filter->filter->name);
@@ -209,7 +209,7 @@ static int link_filter_inouts(AVFilterCo
     }
 
     pad = filter->output_count;
-    while(pad--) {
+    while (pad--) {
         AVFilterInOut *currlinkn = av_mallocz(sizeof(AVFilterInOut));
         currlinkn->filter  = filter;
         currlinkn->pad_idx = pad;
@@ -224,17 +224,17 @@ static int parse_inputs(const char **buf
 {
     int pad = 0;
 
-    while(**buf == '[') {
+    while (**buf == '[') {
         char *name = parse_link_name(buf, log_ctx);
         AVFilterInOut *match;
 
-        if(!name)
+        if (!name)
             return -1;
 
         /* First check if the label is not in the open_outputs list */
         match = extract_inout(name, open_outputs);
 
-        if(match) {
+        if (match) {
             av_free(name);
         } else {
             /* Not in the list, so add it as an input */
@@ -258,22 +258,22 @@ static int parse_outputs(const char **bu
 {
     int pad = 0;
 
-    while(**buf == '[') {
+    while (**buf == '[') {
         char *name = parse_link_name(buf, log_ctx);
         AVFilterInOut *match;
 
         AVFilterInOut *input = *curr_inputs;
         *curr_inputs = (*curr_inputs)->next;
 
-        if(!name)
+        if (!name)
             return -1;
 
         /* First check if the label is not in the open_inputs list */
         match = extract_inout(name, open_inputs);
 
-        if(match) {
-            if(link_filter(input->filter, input->pad_idx,
-                           match->filter, match->pad_idx, log_ctx) < 0)
+        if (match) {
+            if (link_filter(input->filter, input->pad_idx,
+                            match->filter, match->pad_idx, log_ctx) < 0)
                 return -1;
             av_free(match->name);
             av_free(name);
@@ -304,39 +304,39 @@ int avfilter_graph_parse(AVFilterGraph *
         AVFilterContext *filter;
         filters += strspn(filters, WHITESPACES);
 
-        if(parse_inputs(&filters, &curr_inputs, &open_outputs, log_ctx) < 0)
+        if (parse_inputs(&filters, &curr_inputs, &open_outputs, log_ctx) < 0)
             goto fail;
 
         filter = parse_filter(&filters, graph, index, log_ctx);
 
-        if(!filter)
+        if (!filter)
             goto fail;
 
-        if(filter->input_count == 1 && !curr_inputs && !index) {
+        if (filter->input_count == 1 && !curr_inputs && !index) {
             /* First input can be omitted if it is "[in]" */
             const char *tmp = "[in]";
             if(parse_inputs(&tmp, &curr_inputs, &open_outputs, log_ctx) < 0)
                 goto fail;
         }
 
-        if(link_filter_inouts(filter, &curr_inputs, &open_inputs, log_ctx) < 0)
+        if (link_filter_inouts(filter, &curr_inputs, &open_inputs, log_ctx) < 0)
             goto fail;
 
-        if(parse_outputs(&filters, &curr_inputs, &open_inputs, &open_outputs,
+        if (parse_outputs(&filters, &curr_inputs, &open_inputs, &open_outputs,
                          log_ctx) < 0)
             goto fail;
 
         filters += strspn(filters, WHITESPACES);
         chr = *filters++;
 
-        if(chr == ';' && curr_inputs) {
+        if (chr == ';' && curr_inputs) {
             av_log(log_ctx, AV_LOG_ERROR,
                    "Could not find a output to link when parsing \"%s\"\n",
                    filters - 1);
             goto fail;
         }
         index++;
-    } while(chr == ',' || chr == ';');
+    } while (chr == ',' || chr == ';');
 
     if (chr) {
         av_log(log_ctx, AV_LOG_ERROR,
@@ -345,10 +345,10 @@ int avfilter_graph_parse(AVFilterGraph *
         goto fail;
     }
 
-    if(open_inputs && !strcmp(open_inputs->name, "out") && curr_inputs) {
+    if (open_inputs && !strcmp(open_inputs->name, "out") && curr_inputs) {
         /* Last output can be omitted if it is "[out]" */
         const char *tmp = "[out]";
-        if(parse_outputs(&tmp, &curr_inputs, &open_inputs,
+        if (parse_outputs(&tmp, &curr_inputs, &open_inputs,
                          &open_outputs, log_ctx) < 0)
             goto fail;
     }



More information about the ffmpeg-cvslog mailing list