[FFmpeg-cvslog] r25674 - in trunk: doc/APIchanges ffmpeg.c ffplay.c libavfilter/avfilter.h libavfilter/avfiltergraph.c libavfilter/avfiltergraph.h libavfilter/graphparser.c

[stefano]

Author: stefano
Date: Thu Nov  4 21:34:24 2010
New Revision: 25674

Log:
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.

Modified:
   trunk/doc/APIchanges
   trunk/ffmpeg.c
   trunk/ffplay.c
   trunk/libavfilter/avfilter.h
   trunk/libavfilter/avfiltergraph.c
   trunk/libavfilter/avfiltergraph.h
   trunk/libavfilter/graphparser.c

Modified: trunk/doc/APIchanges
==============================================================================
--- trunk/doc/APIchanges	Thu Nov  4 21:34:19 2010	(r25673)
+++ trunk/doc/APIchanges	Thu Nov  4 21:34:24 2010	(r25674)
@@ -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.
 

Modified: trunk/ffmpeg.c
==============================================================================
--- trunk/ffmpeg.c	Thu Nov  4 21:34:19 2010	(r25673)
+++ trunk/ffmpeg.c	Thu Nov  4 21:34:24 2010	(r25674)
@@ -2628,7 +2628,7 @@ static int transcode(AVFormatContext **o
     }
 #if CONFIG_AVFILTER
     if (graph) {
-        avfilter_graph_destroy(graph);
+        avfilter_graph_free(graph);
         av_freep(&graph);
     }
 #endif

Modified: trunk/ffplay.c
==============================================================================
--- trunk/ffplay.c	Thu Nov  4 21:34:19 2010	(r25673)
+++ trunk/ffplay.c	Thu Nov  4 21:34:24 2010	(r25674)
@@ -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);

Modified: trunk/libavfilter/avfilter.h
==============================================================================
--- trunk/libavfilter/avfilter.h	Thu Nov  4 21:34:19 2010	(r25673)
+++ trunk/libavfilter/avfilter.h	Thu Nov  4 21:34:24 2010	(r25674)
@@ -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, \

Modified: trunk/libavfilter/avfiltergraph.c
==============================================================================
--- trunk/libavfilter/avfiltergraph.c	Thu Nov  4 21:34:19 2010	(r25673)
+++ trunk/libavfilter/avfiltergraph.c	Thu Nov  4 21:34:24 2010	(r25674)
@@ -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]);

Modified: trunk/libavfilter/avfiltergraph.h
==============================================================================
--- trunk/libavfilter/avfiltergraph.h	Thu Nov  4 21:34:19 2010	(r25673)
+++ trunk/libavfilter/avfiltergraph.h	Thu Nov  4 21:34:24 2010	(r25674)
@@ -85,6 +85,6 @@ int avfilter_graph_config(AVFilterGraph 
 /**
  * Free a graph and destroy its links.
  */
-void avfilter_graph_destroy(AVFilterGraph *graph);
+void avfilter_graph_free(AVFilterGraph *graph);
 
 #endif  /* AVFILTER_AVFILTERGRAPH_H */

Modified: trunk/libavfilter/graphparser.c
==============================================================================
--- trunk/libavfilter/graphparser.c	Thu Nov  4 21:34:19 2010	(r25673)
+++ trunk/libavfilter/graphparser.c	Thu Nov  4 21:34:24 2010	(r25674)
@@ -375,7 +375,7 @@ int avfilter_graph_parse(AVFilterGraph *
     return 0;
 
  fail:
-    avfilter_graph_destroy(graph);
+    avfilter_graph_free(graph);
     free_inout(open_inputs);
     free_inout(open_outputs);
     free_inout(curr_inputs);