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

diff --git a/doc/APIchanges b/doc/APIchanges
index 63f33b436fca41ccd470ef18ba6213817f4e2cfb..d676b6a7bdfd2cc5b228c500379a814bb46cce4b 100644 (file)
--- a/doc/APIchanges
+++ b/doc/APIchanges
@@ -13,6 +13,10 @@ libavutil:   2009-03-08
 
 API changes, most recent first:
 
+2010-11-08 - r25707 - lavfi 1.59.0 - avfilter_free()
+  Rename avfilter_destroy() to avfilter_free().
+  This change breaks libavfilter API/ABI.
+
 2010-11-07 - r25705 - lavfi 1.58.0 - avfiltergraph.h
   Remove graphparser.h header, move AVFilterInOut and
   avfilter_graph_parse() declarations to libavfilter/avfiltergraph.h.

diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c
index db85718dfec3ac72c53da314f2e50ae12680605d..fa15b35bdee15e19f5f2a653f6cf8947d4ac6e81 100644 (file)
--- a/libavfilter/avfilter.c
+++ b/libavfilter/avfilter.c
@@ -527,7 +527,7 @@ int avfilter_open(AVFilterContext **filter_ctx, AVFilter *filter, const char *in
     return 0;
 }
 
-void avfilter_destroy(AVFilterContext *filter)
+void avfilter_free(AVFilterContext *filter)
 {
     int i;
     AVFilterLink *link;

diff --git a/libavfilter/avfilter.h b/libavfilter/avfilter.h
index 544c2e93f3ad8036f9301afb79cef83da42ccb58..18feadcb6063a8f4493c3abd89d3b7aea9a2fb22 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 58
+#define LIBAVFILTER_VERSION_MINOR 59
 #define LIBAVFILTER_VERSION_MICRO  0
 
 #define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \
@@ -786,11 +786,11 @@ int avfilter_open(AVFilterContext **filter_ctx, AVFilter *filter, const char *in
 int avfilter_init_filter(AVFilterContext *filter, const char *args, void *opaque);
 
 /**
- * Destroy a filter.
+ * Free a filter context.
  *
- * @param filter the filter to destroy
+ * @param filter the filter to free
  */
-void avfilter_destroy(AVFilterContext *filter);
+void avfilter_free(AVFilterContext *filter);
 
 /**
  * Insert a filter in the middle of an existing link.

diff --git a/libavfilter/avfiltergraph.c b/libavfilter/avfiltergraph.c
index 6ce312bbbf943f801323af7b876efa1320f9db3f..16c0355dd8afe43f4dea82f4c82e791dd44f4d23 100644 (file)
--- 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;
                     }
 

diff --git a/libavfilter/graphparser.c b/libavfilter/graphparser.c
index 1bce3bcbb5ef74f33354a49bfe5136fcffc86227..4266e8134d18acb5b3a38627e047aa69741d65ec 100644 (file)
--- a/libavfilter/graphparser.c
+++ b/libavfilter/graphparser.c
@@ -118,7 +118,7 @@ static int create_filter(AVFilterContext **filt_ctx, AVFilterGraph *ctx, int ind
     }
 
     if ((ret = avfilter_graph_add_filter(ctx, *filt_ctx)) < 0) {
-        avfilter_destroy(*filt_ctx);
+        avfilter_free(*filt_ctx);
         return ret;
     }
 

diff --git a/tools/lavfi-showfiltfmts.c b/tools/lavfi-showfiltfmts.c
index 34a6208a7595d91bc25ea0b75cfce60d0aca0960..19bb6f6819a4f86f76b72ff37fd9046d3501eacb 100644 (file)
--- a/tools/lavfi-showfiltfmts.c
+++ b/tools/lavfi-showfiltfmts.c
@@ -93,7 +93,7 @@ int main(int argc, char **argv)
                    av_pix_fmt_descriptors[fmts->formats[j]].name);
     }
 
-    avfilter_destroy(filter_ctx);
+    avfilter_free(filter_ctx);
     fflush(stdout);
     return 0;
 }