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

diff --git a/doc/APIchanges b/doc/APIchanges
index 973b2dfe0dc45286679767db0c4529770d389bca..a60df993ca9c0d40aeaf9e503d47cbf302077208 100644 (file)
--- a/doc/APIchanges
+++ b/doc/APIchanges
@@ -13,6 +13,10 @@ libavutil:   2009-03-08
 
 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()
   Add avfilter_graph_alloc() to libavfilter/avfiltergraph.h.
 

diff --git a/ffmpeg.c b/ffmpeg.c
index 5451acd8d523846e38ae2c6ad00a8a7f3a51f2af..46121c0a5aa42e256fb9f13d6f38b7f4509c4494 100644 (file)
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -2628,7 +2628,7 @@ static int transcode(AVFormatContext **output_files,
     }
 #if CONFIG_AVFILTER
     if (graph) {
-        avfilter_graph_destroy(graph);
+        avfilter_graph_free(graph);
         av_freep(&graph);
     }
 #endif

diff --git a/ffplay.c b/ffplay.c
index 3ee107f745f726f88445ce05c31435657eed146b..60b65a46fa8fcf4c84bbec059c91f3d40e25895c 100644 (file)
--- a/ffplay.c
+++ b/ffplay.c
@@ -1886,7 +1886,7 @@ static int video_thread(void *arg)
     }
  the_end:
 #if CONFIG_AVFILTER
-    avfilter_graph_destroy(graph);
+    avfilter_graph_free(graph);
     av_freep(&graph);
 #endif
     av_free(frame);

diff --git a/libavfilter/avfilter.h b/libavfilter/avfilter.h
index ee1e0ad0376740d362ac3ec84e36fe7f5bdacbee..7cda6fc06d25a1e34252e4028dce50715d4af960 100644 (file)
--- 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 6aa08157b51b8260397bbbd3543cbb8a4688cbc1..6ce312bbbf943f801323af7b876efa1320f9db3f 100644 (file)
--- 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 0b08f026d2513b6c7bcb8959ccb95786cac19753..793c3a44f434bd3b832d5fed45338f278abdc515 100644 (file)
--- 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 fab042369884986084fdd2d8ffac747ca3734556..fb70805d4de14538c7e9dbee116aefba1e2733cd 100644 (file)
--- 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);