Commit 85ab3ee6 authored by vitor's avatar vitor

Give a more meaningful instance name to auto-inserted scaler

Commited in SoC by Vitor Sessak on 2008-04-03 16:51:39


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@12752 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent 6be2d6ba
...@@ -54,6 +54,8 @@ AVFilterContext *avfilter_graph_get_filter(AVFilterGraph *graph, char *name) ...@@ -54,6 +54,8 @@ AVFilterContext *avfilter_graph_get_filter(AVFilterGraph *graph, char *name)
static int query_formats(AVFilterGraph *graph) static int query_formats(AVFilterGraph *graph)
{ {
int i, j; int i, j;
int scaler_count = 0;
char inst_name[30];
/* ask all the sub-filters for their supported colorspaces */ /* ask all the sub-filters for their supported colorspaces */
for(i = 0; i < graph->filter_count; i ++) { for(i = 0; i < graph->filter_count; i ++) {
...@@ -72,9 +74,12 @@ static int query_formats(AVFilterGraph *graph) ...@@ -72,9 +74,12 @@ static int query_formats(AVFilterGraph *graph)
if(link && link->in_formats != link->out_formats) { if(link && link->in_formats != link->out_formats) {
if(!avfilter_merge_formats(link->in_formats, if(!avfilter_merge_formats(link->in_formats,
link->out_formats)) { link->out_formats)) {
AVFilterContext *scale;
/* couldn't merge format lists. auto-insert scale filter */ /* couldn't merge format lists. auto-insert scale filter */
AVFilterContext *scale = snprintf(inst_name, 30, "auto-inserted scaler %d",
avfilter_open(avfilter_get_by_name("scale"), NULL); scaler_count);
scale =
avfilter_open(avfilter_get_by_name("scale"),inst_name);
if(!scale || scale->filter->init(scale, NULL, NULL) || if(!scale || scale->filter->init(scale, NULL, NULL) ||
avfilter_insert_filter(link, scale, 0, 0)) { avfilter_insert_filter(link, scale, 0, 0)) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment