[FFmpeg-devel] [PATCH 4/5] Rename avfilter_graph_destroy() to avfilter_graph_free().

[Stefano Sabatini]

The new name is shorter and more consistent with the rest of the API.
---
 ffmpeg.c                    |    2 +-
 ffplay.c                    |    2 +-
 libavfilter/avfiltergraph.c |    2 +-
 libavfilter/avfiltergraph.h |    2 +-
 libavfilter/graphparser.c   |    2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ffmpeg.c b/ffmpeg.c
index 159c7be..6c0c0cc 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -2626,7 +2626,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 cd175df..1acb5e7 100644
--- a/ffplay.c
+++ b/ffplay.c
@@ -1884,7 +1884,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/avfiltergraph.c b/libavfilter/avfiltergraph.c
index 6aa0815..6ce312b 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 b412bbc..5a5439b 100644
--- a/libavfilter/avfiltergraph.h
+++ b/libavfilter/avfiltergraph.h
@@ -85,7 +85,7 @@ 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);
 
 /**
  * A linked-list of the inputs/outputs of the filter chain.
diff --git a/libavfilter/graphparser.c b/libavfilter/graphparser.c
index b2522c2..5f6d1ef 100644
--- a/libavfilter/graphparser.c
+++ b/libavfilter/graphparser.c
@@ -374,7 +374,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);
-- 
1.7.1