summaryrefslogtreecommitdiff
path: root/libavfilter
diff options
context:
space:
mode:
authorStefano Sabatini <stefano.sabatini-lala@poste.it>2010-11-04 20:34:24 +0000
committerStefano Sabatini <stefano.sabatini-lala@poste.it>2010-11-04 20:34:24 +0000
commit97dd1e4a8797295c1537de3e996a8af0f1adafc9 (patch)
treeab63d1f8fbf554ec259df05bc8277d051ae2e585 /libavfilter
parente15aeea6565f0e6386db7738814fcdde46c2dec3 (diff)
Rename avfilter_graph_destroy() to avfilter_graph_free().
The new name is shorter and more consistent with the rest of the API. This change breaks libavfilter API/ABI. Originally committed as revision 25674 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavfilter')
-rw-r--r--libavfilter/avfilter.h2
-rw-r--r--libavfilter/avfiltergraph.c2
-rw-r--r--libavfilter/avfiltergraph.h2
-rw-r--r--libavfilter/graphparser.c2
4 files changed, 4 insertions, 4 deletions
diff --git a/libavfilter/avfilter.h b/libavfilter/avfilter.h
index ee1e0ad037..7cda6fc06d 100644
--- a/libavfilter/avfilter.h
+++ b/libavfilter/avfilter.h
@@ -25,7 +25,7 @@
#include "libavutil/avutil.h"
#define LIBAVFILTER_VERSION_MAJOR 1
-#define LIBAVFILTER_VERSION_MINOR 55
+#define LIBAVFILTER_VERSION_MINOR 56
#define LIBAVFILTER_VERSION_MICRO 0
#define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \
diff --git a/libavfilter/avfiltergraph.c b/libavfilter/avfiltergraph.c
index 6aa08157b5..6ce312bbbf 100644
--- a/libavfilter/avfiltergraph.c
+++ b/libavfilter/avfiltergraph.c
@@ -31,7 +31,7 @@ AVFilterGraph *avfilter_graph_alloc(void)
return av_mallocz(sizeof(AVFilterGraph));
}
-void avfilter_graph_destroy(AVFilterGraph *graph)
+void avfilter_graph_free(AVFilterGraph *graph)
{
for(; graph->filter_count > 0; graph->filter_count --)
avfilter_destroy(graph->filters[graph->filter_count - 1]);
diff --git a/libavfilter/avfiltergraph.h b/libavfilter/avfiltergraph.h
index 0b08f026d2..793c3a44f4 100644
--- a/libavfilter/avfiltergraph.h
+++ b/libavfilter/avfiltergraph.h
@@ -85,6 +85,6 @@ int avfilter_graph_config(AVFilterGraph *graphctx, AVClass *log_ctx);
/**
* Free a graph and destroy its links.
*/
-void avfilter_graph_destroy(AVFilterGraph *graph);
+void avfilter_graph_free(AVFilterGraph *graph);
#endif /* AVFILTER_AVFILTERGRAPH_H */
diff --git a/libavfilter/graphparser.c b/libavfilter/graphparser.c
index fab0423698..fb70805d4d 100644
--- a/libavfilter/graphparser.c
+++ b/libavfilter/graphparser.c
@@ -375,7 +375,7 @@ int avfilter_graph_parse(AVFilterGraph *graph, const char *filters,
return 0;
fail:
- avfilter_graph_destroy(graph);
+ avfilter_graph_free(graph);
free_inout(open_inputs);
free_inout(open_outputs);
free_inout(curr_inputs);