Browse Source

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

Originally committed as revision 24418 to svn://svn.ffmpeg.org/ffmpeg/trunk
tags/n0.8
Stefano Sabatini 15 years ago
parent
commit
f219eee592
1 changed files with 34 additions and 34 deletions
  1. +34
    -34
      libavfilter/graphparser.c

+ 34
- 34
libavfilter/graphparser.c View File

@@ -34,7 +34,7 @@ static int link_filter(AVFilterContext *src, int srcpad,
AVFilterContext *dst, int dstpad, AVFilterContext *dst, int dstpad,
AVClass *log_ctx) AVClass *log_ctx)
{ {
if(avfilter_link(src, srcpad, dst, dstpad)) {
if (avfilter_link(src, srcpad, dst, dstpad)) {
av_log(log_ctx, AV_LOG_ERROR, av_log(log_ctx, AV_LOG_ERROR,
"cannot create the link %s:%d -> %s:%d\n", "cannot create the link %s:%d -> %s:%d\n",
src->filter->name, srcpad, dst->filter->name, dstpad); src->filter->name, srcpad, dst->filter->name, dstpad);
@@ -57,13 +57,13 @@ static char *parse_link_name(const char **buf, AVClass *log_ctx)


name = av_get_token(buf, "]"); name = av_get_token(buf, "]");


if(!name[0]) {
if (!name[0]) {
av_log(log_ctx, AV_LOG_ERROR, av_log(log_ctx, AV_LOG_ERROR,
"Bad (empty?) label found in the following: \"%s\".\n", start); "Bad (empty?) label found in the following: \"%s\".\n", start);
goto fail; goto fail;
} }


if(*(*buf)++ != ']') {
if (*(*buf)++ != ']') {
av_log(log_ctx, AV_LOG_ERROR, av_log(log_ctx, AV_LOG_ERROR,
"Mismatched '[' found in the following: \"%s\".\n", start); "Mismatched '[' found in the following: \"%s\".\n", start);
fail: fail:
@@ -87,20 +87,20 @@ static AVFilterContext *create_filter(AVFilterGraph *ctx, int index,


filt = avfilter_get_by_name(filt_name); filt = avfilter_get_by_name(filt_name);


if(!filt) {
if (!filt) {
av_log(log_ctx, AV_LOG_ERROR, av_log(log_ctx, AV_LOG_ERROR,
"no such filter: '%s'\n", filt_name); "no such filter: '%s'\n", filt_name);
return NULL; return NULL;
} }


filt_ctx = avfilter_open(filt, inst_name); filt_ctx = avfilter_open(filt, inst_name);
if(!filt_ctx) {
if (!filt_ctx) {
av_log(log_ctx, AV_LOG_ERROR, av_log(log_ctx, AV_LOG_ERROR,
"error creating filter '%s'\n", filt_name); "error creating filter '%s'\n", filt_name);
return NULL; return NULL;
} }


if(avfilter_graph_add_filter(ctx, filt_ctx) < 0) {
if (avfilter_graph_add_filter(ctx, filt_ctx) < 0) {
avfilter_destroy(filt_ctx); avfilter_destroy(filt_ctx);
return NULL; return NULL;
} }
@@ -111,7 +111,7 @@ static AVFilterContext *create_filter(AVFilterGraph *ctx, int index,
args = tmp_args; 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, av_log(log_ctx, AV_LOG_ERROR,
"error initializing filter '%s' with args '%s'\n", filt_name, args); "error initializing filter '%s' with args '%s'\n", filt_name, args);
return NULL; return NULL;
@@ -130,7 +130,7 @@ static AVFilterContext *parse_filter(const char **buf, AVFilterGraph *graph,
char *name = av_get_token(buf, "=,;[\n"); char *name = av_get_token(buf, "=,;[\n");
AVFilterContext *ret; AVFilterContext *ret;


if(**buf == '=') {
if (**buf == '=') {
(*buf)++; (*buf)++;
opts = av_get_token(buf, "[],;\n"); opts = av_get_token(buf, "[],;\n");
} }
@@ -143,7 +143,7 @@ static AVFilterContext *parse_filter(const char **buf, AVFilterGraph *graph,


static void free_inout(AVFilterInOut *head) static void free_inout(AVFilterInOut *head)
{ {
while(head) {
while (head) {
AVFilterInOut *next = head->next; AVFilterInOut *next = head->next;
av_free(head->name); av_free(head->name);
av_free(head); av_free(head);
@@ -155,12 +155,12 @@ static AVFilterInOut *extract_inout(const char *label, AVFilterInOut **links)
{ {
AVFilterInOut *ret; AVFilterInOut *ret;


while(*links && strcmp((*links)->name, label))
while (*links && strcmp((*links)->name, label))
links = &((*links)->next); links = &((*links)->next);


ret = *links; ret = *links;


if(ret)
if (ret)
*links = ret->next; *links = ret->next;


return ret; return ret;
@@ -178,9 +178,9 @@ static int link_filter_inouts(AVFilterContext *filter,
{ {
int pad = filter->input_count; int pad = filter->input_count;


while(pad--) {
while (pad--) {
AVFilterInOut *p = *curr_inputs; AVFilterInOut *p = *curr_inputs;
if(!p) {
if (!p) {
av_log(log_ctx, AV_LOG_ERROR, av_log(log_ctx, AV_LOG_ERROR,
"Not enough inputs specified for the \"%s\" filter.\n", "Not enough inputs specified for the \"%s\" filter.\n",
filter->filter->name); filter->filter->name);
@@ -189,8 +189,8 @@ static int link_filter_inouts(AVFilterContext *filter,


*curr_inputs = (*curr_inputs)->next; *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; return -1;
av_free(p->name); av_free(p->name);
av_free(p); av_free(p);
@@ -201,7 +201,7 @@ static int link_filter_inouts(AVFilterContext *filter,
} }
} }


if(*curr_inputs) {
if (*curr_inputs) {
av_log(log_ctx, AV_LOG_ERROR, av_log(log_ctx, AV_LOG_ERROR,
"Too many inputs specified for the \"%s\" filter.\n", "Too many inputs specified for the \"%s\" filter.\n",
filter->filter->name); filter->filter->name);
@@ -209,7 +209,7 @@ static int link_filter_inouts(AVFilterContext *filter,
} }


pad = filter->output_count; pad = filter->output_count;
while(pad--) {
while (pad--) {
AVFilterInOut *currlinkn = av_mallocz(sizeof(AVFilterInOut)); AVFilterInOut *currlinkn = av_mallocz(sizeof(AVFilterInOut));
currlinkn->filter = filter; currlinkn->filter = filter;
currlinkn->pad_idx = pad; currlinkn->pad_idx = pad;
@@ -224,17 +224,17 @@ static int parse_inputs(const char **buf, AVFilterInOut **curr_inputs,
{ {
int pad = 0; int pad = 0;


while(**buf == '[') {
while (**buf == '[') {
char *name = parse_link_name(buf, log_ctx); char *name = parse_link_name(buf, log_ctx);
AVFilterInOut *match; AVFilterInOut *match;


if(!name)
if (!name)
return -1; return -1;


/* First check if the label is not in the open_outputs list */ /* First check if the label is not in the open_outputs list */
match = extract_inout(name, open_outputs); match = extract_inout(name, open_outputs);


if(match) {
if (match) {
av_free(name); av_free(name);
} else { } else {
/* Not in the list, so add it as an input */ /* Not in the list, so add it as an input */
@@ -258,22 +258,22 @@ static int parse_outputs(const char **buf, AVFilterInOut **curr_inputs,
{ {
int pad = 0; int pad = 0;


while(**buf == '[') {
while (**buf == '[') {
char *name = parse_link_name(buf, log_ctx); char *name = parse_link_name(buf, log_ctx);
AVFilterInOut *match; AVFilterInOut *match;


AVFilterInOut *input = *curr_inputs; AVFilterInOut *input = *curr_inputs;
*curr_inputs = (*curr_inputs)->next; *curr_inputs = (*curr_inputs)->next;


if(!name)
if (!name)
return -1; return -1;


/* First check if the label is not in the open_inputs list */ /* First check if the label is not in the open_inputs list */
match = extract_inout(name, open_inputs); 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; return -1;
av_free(match->name); av_free(match->name);
av_free(name); av_free(name);
@@ -304,39 +304,39 @@ int avfilter_graph_parse(AVFilterGraph *graph, const char *filters,
AVFilterContext *filter; AVFilterContext *filter;
filters += strspn(filters, WHITESPACES); 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; goto fail;


filter = parse_filter(&filters, graph, index, log_ctx); filter = parse_filter(&filters, graph, index, log_ctx);


if(!filter)
if (!filter)
goto fail; 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]" */ /* First input can be omitted if it is "[in]" */
const char *tmp = "[in]"; const char *tmp = "[in]";
if(parse_inputs(&tmp, &curr_inputs, &open_outputs, log_ctx) < 0) if(parse_inputs(&tmp, &curr_inputs, &open_outputs, log_ctx) < 0)
goto fail; 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; 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) log_ctx) < 0)
goto fail; goto fail;


filters += strspn(filters, WHITESPACES); filters += strspn(filters, WHITESPACES);
chr = *filters++; chr = *filters++;


if(chr == ';' && curr_inputs) {
if (chr == ';' && curr_inputs) {
av_log(log_ctx, AV_LOG_ERROR, av_log(log_ctx, AV_LOG_ERROR,
"Could not find a output to link when parsing \"%s\"\n", "Could not find a output to link when parsing \"%s\"\n",
filters - 1); filters - 1);
goto fail; goto fail;
} }
index++; index++;
} while(chr == ',' || chr == ';');
} while (chr == ',' || chr == ';');


if (chr) { if (chr) {
av_log(log_ctx, AV_LOG_ERROR, av_log(log_ctx, AV_LOG_ERROR,
@@ -345,10 +345,10 @@ int avfilter_graph_parse(AVFilterGraph *graph, const char *filters,
goto fail; 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]" */ /* Last output can be omitted if it is "[out]" */
const char *tmp = "[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) &open_outputs, log_ctx) < 0)
goto fail; goto fail;
} }


Loading…
Cancel
Save