Commit 4359288c authored by Stefano Sabatini's avatar Stefano Sabatini Committed by Mans Rullgard
Browse files

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: default avatarMans Rullgard <mans@mansr.com>
parent e8e5dde7
......@@ -2698,10 +2698,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 ! */
......
......@@ -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;
......
......@@ -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)
......
......@@ -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.
......
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