RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Change thisIsAVar variable names to this_is_a_var style, more 

consistent with the rest of libav*.

Originally committed as revision 16356 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Stefano Sabatini 2008-12-27 09:31:05 +00:00
parent b870027a19
commit 7f9b3266c9
1 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
libavfilter/graphparser.c
View File

@ -211,13 +211,13 @@ static void insert_inout(AVFilterInOut **inouts, AVFilterInOut *element)
} }
static int link_filter_inouts(AVFilterContext *filter, static int link_filter_inouts(AVFilterContext *filter,
AVFilterInOut **currInputs, AVFilterInOut **curr_inputs,
AVFilterInOut **openInputs, AVClass *log_ctx) AVFilterInOut **open_inputs, AVClass *log_ctx)
{ {
int pad = filter->input_count; int pad = filter->input_count;
while(pad--) { while(pad--) {
AVFilterInOut *p = *currInputs; 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",
@ -225,7 +225,7 @@ static int link_filter_inouts(AVFilterContext *filter,
return -1; return -1;
} }
*currInputs = (*currInputs)->next; *curr_inputs = (*curr_inputs)->next;
if(p->filter) { if(p->filter) {
if(link_filter(p->filter, p->pad_idx, filter, pad, log_ctx)) if(link_filter(p->filter, p->pad_idx, filter, pad, log_ctx))
@ -235,11 +235,11 @@ static int link_filter_inouts(AVFilterContext *filter,
} else { } else {
p->filter = filter; p->filter = filter;
p->pad_idx = pad; p->pad_idx = pad;
insert_inout(openInputs, p); insert_inout(open_inputs, p);
} }
} }
if(*currInputs) { 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);
@ -251,14 +251,14 @@ static int link_filter_inouts(AVFilterContext *filter,
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;
insert_inout(currInputs, currlinkn); insert_inout(curr_inputs, currlinkn);
} }
return 0; return 0;
} }
static int parse_inputs(const char **buf, AVFilterInOut **currInputs, static int parse_inputs(const char **buf, AVFilterInOut **curr_inputs,
AVFilterInOut **openOutputs, AVClass *log_ctx) AVFilterInOut **open_outputs, AVClass *log_ctx)
{ {
int pad = 0; int pad = 0;
@ -269,8 +269,8 @@ static int parse_inputs(const char **buf, AVFilterInOut **currInputs,
if(!name) if(!name)
return -1; return -1;
/* First check if the label is not in the openOutputs list */ /* First check if the label is not in the open_outputs list */
match = extract_inout(name, openOutputs); match = extract_inout(name, open_outputs);
if(match) { if(match) {
av_free(name); av_free(name);
@ -281,7 +281,7 @@ static int parse_inputs(const char **buf, AVFilterInOut **currInputs,
match->pad_idx = pad; match->pad_idx = pad;
} }
insert_inout(currInputs, match); insert_inout(curr_inputs, match);
*buf += consume_whitespace(*buf); *buf += consume_whitespace(*buf);
pad++; pad++;
@ -290,9 +290,9 @@ static int parse_inputs(const char **buf, AVFilterInOut **currInputs,
return pad; return pad;
} }
static int parse_outputs(const char **buf, AVFilterInOut **currInputs, static int parse_outputs(const char **buf, AVFilterInOut **curr_inputs,
AVFilterInOut **openInputs, AVFilterInOut **open_inputs,
AVFilterInOut **openOutputs, AVClass *log_ctx) AVFilterInOut **open_outputs, AVClass *log_ctx)
{ {
int pad = 0; int pad = 0;
@ -300,14 +300,14 @@ static int parse_outputs(const char **buf, AVFilterInOut **currInputs,
char *name = parse_link_name(buf, log_ctx); char *name = parse_link_name(buf, log_ctx);
AVFilterInOut *match; AVFilterInOut *match;
AVFilterInOut *input = *currInputs; AVFilterInOut *input = *curr_inputs;
*currInputs = (*currInputs)->next; *curr_inputs = (*curr_inputs)->next;
if(!name) if(!name)
return -1; return -1;
/* First check if the label is not in the openInputs list */ /* First check if the label is not in the open_inputs list */
match = extract_inout(name, openInputs); match = extract_inout(name, open_inputs);
if(match) { if(match) {
if(link_filter(input->filter, input->pad_idx, if(link_filter(input->filter, input->pad_idx,
@ -318,9 +318,9 @@ static int parse_outputs(const char **buf, AVFilterInOut **currInputs,
av_free(match); av_free(match);
av_free(input); av_free(input);
} else { } else {
/* Not in the list, so add the first input as a openOutput */ /* Not in the list, so add the first input as a open_output */
input->name = name; input->name = name;
insert_inout(openOutputs, input); insert_inout(open_outputs, input);
} }
*buf += consume_whitespace(*buf); *buf += consume_whitespace(*buf);
pad++; pad++;
@ -330,19 +330,19 @@ static int parse_outputs(const char **buf, AVFilterInOut **currInputs,
} }
int avfilter_parse_graph(AVFilterGraph *graph, const char *filters, int avfilter_parse_graph(AVFilterGraph *graph, const char *filters,
AVFilterInOut *openInputs, AVFilterInOut *open_inputs,
AVFilterInOut *openOutputs, AVClass *log_ctx) AVFilterInOut *open_outputs, AVClass *log_ctx)
{ {
int index = 0; int index = 0;
char chr = 0; char chr = 0;
AVFilterInOut *currInputs = NULL; AVFilterInOut *curr_inputs = NULL;
do { do {
AVFilterContext *filter; AVFilterContext *filter;
filters += consume_whitespace(filters); filters += consume_whitespace(filters);
if(parse_inputs(&filters, &currInputs, &openOutputs, 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);
@ -350,24 +350,24 @@ int avfilter_parse_graph(AVFilterGraph *graph, const char *filters,
if(!filter) if(!filter)
goto fail; goto fail;
if(filter->input_count == 1 && !currInputs && !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, &currInputs, &openOutputs, log_ctx) < 0) if(parse_inputs(&tmp, &curr_inputs, &open_outputs, log_ctx) < 0)
goto fail; goto fail;
} }
if(link_filter_inouts(filter, &currInputs, &openInputs, log_ctx) < 0) if(link_filter_inouts(filter, &curr_inputs, &open_inputs, log_ctx) < 0)
goto fail; goto fail;
if(parse_outputs(&filters, &currInputs, &openInputs, &openOutputs, if(parse_outputs(&filters, &curr_inputs, &open_inputs, &open_outputs,
log_ctx) < 0) log_ctx) < 0)
goto fail; goto fail;
filters += consume_whitespace(filters); filters += consume_whitespace(filters);
chr = *filters++; chr = *filters++;
if(chr == ';' && currInputs) { 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);
@ -376,11 +376,11 @@ int avfilter_parse_graph(AVFilterGraph *graph, const char *filters,
index++; index++;
} while(chr == ',' || chr == ';'); } while(chr == ',' || chr == ';');
if(openInputs && !strcmp(openInputs->name, "out") && currInputs) { 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, &currInputs, &openInputs, if(parse_outputs(&tmp, &curr_inputs, &open_inputs,
&openOutputs, log_ctx) < 0) &open_outputs, log_ctx) < 0)
goto fail; goto fail;
} }
@ -388,8 +388,8 @@ int avfilter_parse_graph(AVFilterGraph *graph, const char *filters,
fail: fail:
avfilter_destroy_graph(graph); avfilter_destroy_graph(graph);
free_inout(openInputs); free_inout(open_inputs);
free_inout(openOutputs); free_inout(open_outputs);
free_inout(currInputs); free_inout(curr_inputs);
return -1; return -1;
} }