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

Make avfilter_graph_free() free the graph. 

Make avfilter_graph_free() free not only the internal structures, but
also the allocated graph, and set the graph pointer to NULL for
increased safety.

Simplify usage.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 4359288c56)
This commit is contained in:
Stefano Sabatini 2011-02-01 20:02:17 +01:00 committed by Michael Niedermayer
parent c68be8e135
commit ab543afe47
4 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ffmpeg.c
View File

@ -2708,10 +2708,7 @@ static int transcode(AVFormatContext **output_files,
}
}
#if CONFIG_AVFILTER
if (graph) {
avfilter_graph_free(graph);
av_freep(&graph);
}
avfilter_graph_free(&graph);
#endif
/* finished ! */

3
ffplay.c
View File

@ -1899,8 +1899,7 @@ static int video_thread(void *arg)
}
the_end:
#if CONFIG_AVFILTER
avfilter_graph_free(graph);
av_freep(&graph);
avfilter_graph_free(&graph);
#endif
av_free(frame);
return 0;

13
libavfilter/avfiltergraph.c
View File

@ -32,14 +32,15 @@ AVFilterGraph *avfilter_graph_alloc(void)
return av_mallocz(sizeof(AVFilterGraph));
}
void avfilter_graph_free(AVFilterGraph *graph)
void avfilter_graph_free(AVFilterGraph **graph)
{
if (!graph)
if (!*graph)
return;
for (; graph->filter_count > 0; graph->filter_count --)
avfilter_free(graph->filters[graph->filter_count - 1]);
av_freep(&graph->scale_sws_opts);
av_freep(&graph->filters);
for (; (*graph)->filter_count > 0; (*graph)->filter_count--)
avfilter_free((*graph)->filters[(*graph)->filter_count - 1]);
av_freep(&(*graph)->scale_sws_opts);
av_freep(&(*graph)->filters);
av_freep(graph);
}
int avfilter_graph_add_filter(AVFilterGraph *graph, AVFilterContext *filter)

5
libavfilter/avfiltergraph.h
View File

@ -79,9 +79,10 @@ int avfilter_graph_create_filter(AVFilterContext **filt_ctx, AVFilter *filt,
int avfilter_graph_config(AVFilterGraph *graphctx, AVClass *log_ctx);
/**
* Free a graph and destroy its links, graph may be NULL.
* Free a graph, destroy its links, and set *graph to NULL.
* If *graph is NULL, do nothing.
*/
void avfilter_graph_free(AVFilterGraph *graph);
void avfilter_graph_free(AVFilterGraph **graph);
/**
* A linked-list of the inputs/outputs of the filter chain.