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

Handle av_realloc() failure 

Commited in SoC by Vitor Sessak on 2008-04-04 15:35:38

Originally committed as revision 12754 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Vitor Sessak 2008-04-04 20:09:47 +00:00
parent 51bf654d79
commit 4e4a3e2314
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libavfilter/avfiltergraph.c
View File

@ -33,11 +33,17 @@ void avfilter_destroy_graph(AVFilterGraph *graph)
av_freep(&graph->filters);
}
void avfilter_graph_add_filter(AVFilterGraph *graph, AVFilterContext *filter)
int avfilter_graph_add_filter(AVFilterGraph *graph, AVFilterContext *filter)
{
graph->filters = av_realloc(graph->filters,
sizeof(AVFilterContext*) * ++graph->filter_count);
if (!graph->filters)
return -1;
graph->filters[graph->filter_count - 1] = filter;
return 0;
}
AVFilterContext *avfilter_graph_get_filter(AVFilterGraph *graph, char *name)
@ -87,7 +93,9 @@ static int query_formats(AVFilterGraph *graph)
return -1;
}
avfilter_graph_add_filter(graph, scale);
if (avfilter_graph_add_filter(graph, scale) < 0)
return -1;
scale->filter->query_formats(scale);
if(!avfilter_merge_formats(scale-> inputs[0]->in_formats,
scale-> inputs[0]->out_formats)||

2
libavfilter/avfiltergraph.h
View File

@ -39,7 +39,7 @@ AVFilterContext *avfilter_graph_get_filter(AVFilterGraph *graph, char *name);
* @param graph The filter graph
* @param filter The filter to be added
*/
void avfilter_graph_add_filter(AVFilterGraph *graphctx, AVFilterContext *filter);
int avfilter_graph_add_filter(AVFilterGraph *graphctx, AVFilterContext *filter);
/**
* Configure the formats of all the links in the graph.