summaryrefslogtreecommitdiff
path: root/libavfilter/avfiltergraph.c
diff options
context:
space:
mode:
authorStefano Sabatini <stefano.sabatini-lala@poste.it>2010-11-08 12:32:39 +0000
committerStefano Sabatini <stefano.sabatini-lala@poste.it>2010-11-08 12:32:39 +0000
commit24de0edbd589b7cb0da51260073a1a28bb6a2619 (patch)
treef808dd5e52a5cd81742f76e2b722e4dde981792c /libavfilter/avfiltergraph.c
parent7b3937360efd16ae87fa44fc4633a74913b5ac4d (diff)
Rename avfilter_destroy() as avfilter_free().
The new name is shorter and more consistent with the FFmpeg API, and sounds less evil. Originally committed as revision 25707 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavfilter/avfiltergraph.c')
-rw-r--r--libavfilter/avfiltergraph.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavfilter/avfiltergraph.c b/libavfilter/avfiltergraph.c
index 6ce312bbbf..16c0355dd8 100644
--- a/libavfilter/avfiltergraph.c
+++ b/libavfilter/avfiltergraph.c
@@ -34,7 +34,7 @@ AVFilterGraph *avfilter_graph_alloc(void)
void avfilter_graph_free(AVFilterGraph *graph)
{
for(; graph->filter_count > 0; graph->filter_count --)
- avfilter_destroy(graph->filters[graph->filter_count - 1]);
+ avfilter_free(graph->filters[graph->filter_count - 1]);
av_freep(&graph->scale_sws_opts);
av_freep(&graph->filters);
}
@@ -143,7 +143,7 @@ static int query_formats(AVFilterGraph *graph, AVClass *log_ctx)
snprintf(scale_args, sizeof(scale_args), "0:0:%s", graph->scale_sws_opts);
if(!scale || scale->filter->init(scale, scale_args, NULL) ||
avfilter_insert_filter(link, scale, 0, 0)) {
- avfilter_destroy(scale);
+ avfilter_free(scale);
return -1;
}