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

Make filter auto-insertion code its own function. 

Commited in SoC by Bobby Bingham on 2007-11-04 22:03:14

Originally committed as revision 12026 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Vitor Sessak 2008-02-15 21:39:19 +00:00
parent 4ea0ab3c39
commit 52362e9dc1
1 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
libavfilter/avfilter.c
View File

@ -108,6 +108,27 @@ static int common_format(int *fmts0, int *fmts1)
return -1; return -1;
} }
int avfilter_insert_filter(AVFilterLink *link, AVFilterContext *filt,
unsigned in, unsigned out)
{
av_log(NULL, AV_LOG_INFO, "auto-inserting filter '%s'\n",
filt->filter->name);
link->dst->inputs[link->dstpad] = NULL;
if(avfilter_link(filt, out, link->dst, link->dstpad)) {
/* failed to link output filter to new filter */
link->dst->inputs[link->dstpad] = link;
return -1;
}
/* re-hookup the link to the new destination filter we inserted */
link->dst = filt;
link->dstpad = in;
filt->inputs[in] = link;
return 0;
}
int avfilter_config_link(AVFilterLink *link) int avfilter_config_link(AVFilterLink *link)
{ {
int *fmts[3] = {NULL,NULL,NULL}; int *fmts[3] = {NULL,NULL,NULL};
@ -133,16 +154,9 @@ int avfilter_config_link(AVFilterLink *link)
avfilter_destroy(scale); avfilter_destroy(scale);
goto format_done; goto format_done;
} }
if(avfilter_insert_filter(link, scale, 0, 0))
link->dst->inputs[link->dstpad] = NULL;
if(avfilter_link(scale, 0, link->dst, link->dstpad)) {
link->dst->inputs[link->dstpad] = link;
goto format_done; goto format_done;
}
link2 = scale->outputs[0]; link2 = scale->outputs[0];
link->dst = scale;
link->dstpad = 0;
scale->inputs[0] = link;
/* now try again to find working colorspaces. /* now try again to find working colorspaces.
* XXX: is it safe to assume that the scale filter always supports the * XXX: is it safe to assume that the scale filter always supports the