Commit 97dd1e4a authored by Stefano Sabatini's avatar Stefano Sabatini

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
parent e15aeea6
...@@ -13,6 +13,10 @@ libavutil: 2009-03-08 ...@@ -13,6 +13,10 @@ libavutil: 2009-03-08
API changes, most recent first: API changes, most recent first:
2010-11-04 - r25673 - lavfi 1.56.0 - avfilter_graph_free()
Rename avfilter_graph_destroy() to avfilter_graph_free().
This change breaks libavfilter API/ABI.
2010-11-04 - r25672 - lavfi 1.55.0 - avfilter_graph_alloc() 2010-11-04 - r25672 - lavfi 1.55.0 - avfilter_graph_alloc()
Add avfilter_graph_alloc() to libavfilter/avfiltergraph.h. Add avfilter_graph_alloc() to libavfilter/avfiltergraph.h.
......
...@@ -2628,7 +2628,7 @@ static int transcode(AVFormatContext **output_files, ...@@ -2628,7 +2628,7 @@ static int transcode(AVFormatContext **output_files,
} }
#if CONFIG_AVFILTER #if CONFIG_AVFILTER
if (graph) { if (graph) {
avfilter_graph_destroy(graph); avfilter_graph_free(graph);
av_freep(&graph); av_freep(&graph);
} }
#endif #endif
......
...@@ -1886,7 +1886,7 @@ static int video_thread(void *arg) ...@@ -1886,7 +1886,7 @@ static int video_thread(void *arg)
} }
the_end: the_end:
#if CONFIG_AVFILTER #if CONFIG_AVFILTER
avfilter_graph_destroy(graph); avfilter_graph_free(graph);
av_freep(&graph); av_freep(&graph);
#endif #endif
av_free(frame); av_free(frame);
......
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
#include "libavutil/avutil.h" #include "libavutil/avutil.h"
#define LIBAVFILTER_VERSION_MAJOR 1 #define LIBAVFILTER_VERSION_MAJOR 1
#define LIBAVFILTER_VERSION_MINOR 55 #define LIBAVFILTER_VERSION_MINOR 56
#define LIBAVFILTER_VERSION_MICRO 0 #define LIBAVFILTER_VERSION_MICRO 0
#define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \ #define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \
......
...@@ -31,7 +31,7 @@ AVFilterGraph *avfilter_graph_alloc(void) ...@@ -31,7 +31,7 @@ AVFilterGraph *avfilter_graph_alloc(void)
return av_mallocz(sizeof(AVFilterGraph)); 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 --) for(; graph->filter_count > 0; graph->filter_count --)
avfilter_destroy(graph->filters[graph->filter_count - 1]); avfilter_destroy(graph->filters[graph->filter_count - 1]);
......
...@@ -85,6 +85,6 @@ int avfilter_graph_config(AVFilterGraph *graphctx, AVClass *log_ctx); ...@@ -85,6 +85,6 @@ int avfilter_graph_config(AVFilterGraph *graphctx, AVClass *log_ctx);
/** /**
* Free a graph and destroy its links. * Free a graph and destroy its links.
*/ */
void avfilter_graph_destroy(AVFilterGraph *graph); void avfilter_graph_free(AVFilterGraph *graph);
#endif /* AVFILTER_AVFILTERGRAPH_H */ #endif /* AVFILTER_AVFILTERGRAPH_H */
...@@ -375,7 +375,7 @@ int avfilter_graph_parse(AVFilterGraph *graph, const char *filters, ...@@ -375,7 +375,7 @@ int avfilter_graph_parse(AVFilterGraph *graph, const char *filters,
return 0; return 0;
fail: fail:
avfilter_graph_destroy(graph); avfilter_graph_free(graph);
free_inout(open_inputs); free_inout(open_inputs);
free_inout(open_outputs); free_inout(open_outputs);
free_inout(curr_inputs); free_inout(curr_inputs);
......
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