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

[stefano]

Author: stefano
Date: Sun Nov  7 23:56:29 2010
New Revision: 25705

Log:
Remove graphparser.h header, move AVFilterInOut and
avfilter_graph_parse() declaration to libavfilter/avfiltergraph.h.

Simplify, and less confusing for the user.

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

Modified: trunk/doc/APIchanges
==============================================================================
--- trunk/doc/APIchanges	Sun Nov  7 23:47:37 2010	(r25704)
+++ trunk/doc/APIchanges	Sun Nov  7 23:56:29 2010	(r25705)
@@ -13,6 +13,10 @@ libavutil:   2009-03-08
 
 API changes, most recent first:
 
+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.
+
 2010-11-07 - r25700 - lavfi 1.57.0 - AVFilterInOut
   Rename field AVFilterInOut.filter to AVFilterInOut.filter_ctx.
   This change breaks libavfilter API.

Modified: trunk/ffmpeg.c
==============================================================================
--- trunk/ffmpeg.c	Sun Nov  7 23:47:37 2010	(r25704)
+++ trunk/ffmpeg.c	Sun Nov  7 23:56:29 2010	(r25705)
@@ -49,7 +49,6 @@
 #if CONFIG_AVFILTER
 # include "libavfilter/avfilter.h"
 # include "libavfilter/avfiltergraph.h"
-# include "libavfilter/graphparser.h"
 # include "libavfilter/vsrc_buffer.h"
 #endif
 

Modified: trunk/ffplay.c
==============================================================================
--- trunk/ffplay.c	Sun Nov  7 23:47:37 2010	(r25704)
+++ trunk/ffplay.c	Sun Nov  7 23:56:29 2010	(r25705)
@@ -41,7 +41,6 @@
 #if CONFIG_AVFILTER
 # include "libavfilter/avfilter.h"
 # include "libavfilter/avfiltergraph.h"
-# include "libavfilter/graphparser.h"
 #endif
 
 #include "cmdutils.h"

Modified: trunk/libavfilter/avfilter.h
==============================================================================
--- trunk/libavfilter/avfilter.h	Sun Nov  7 23:47:37 2010	(r25704)
+++ trunk/libavfilter/avfilter.h	Sun Nov  7 23:56:29 2010	(r25705)
@@ -25,7 +25,7 @@
 #include "libavutil/avutil.h"
 
 #define LIBAVFILTER_VERSION_MAJOR  1
-#define LIBAVFILTER_VERSION_MINOR 57
+#define LIBAVFILTER_VERSION_MINOR 58
 #define LIBAVFILTER_VERSION_MICRO  0
 
 #define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \

Modified: trunk/libavfilter/avfiltergraph.h
==============================================================================
--- trunk/libavfilter/avfiltergraph.h	Sun Nov  7 23:47:37 2010	(r25704)
+++ trunk/libavfilter/avfiltergraph.h	Sun Nov  7 23:56:29 2010	(r25705)
@@ -87,4 +87,40 @@ int avfilter_graph_config(AVFilterGraph 
  */
 void avfilter_graph_free(AVFilterGraph *graph);
 
+/**
+ * A linked-list of the inputs/outputs of the filter chain.
+ *
+ * This is mainly useful for avfilter_graph_parse(), since this
+ * function may accept a description of a graph with not connected
+ * input/output pads. This struct specifies, per each not connected
+ * pad contained in the graph, the filter context and the pad index
+ * required for establishing a link.
+ */
+typedef struct AVFilterInOut {
+    /** unique name for this input/output in the list */
+    char *name;
+
+    /** filter context associated to this input/output */
+    AVFilterContext *filter_ctx;
+
+    /** index of the filt_ctx pad to use for linking */
+    int pad_idx;
+
+    /** next input/input in the list, NULL if this is the last */
+    struct AVFilterInOut *next;
+} AVFilterInOut;
+
+/**
+ * Add a graph described by a string to a graph.
+ *
+ * @param graph   the filter graph where to link the parsed graph context
+ * @param filters string to be parsed
+ * @param inputs  linked list to the inputs of the graph
+ * @param outputs linked list to the outputs of the graph
+ * @return zero on success, a negative AVERROR code on error
+ */
+int avfilter_graph_parse(AVFilterGraph *graph, const char *filters,
+                         AVFilterInOut *inputs, AVFilterInOut *outputs,
+                         AVClass *log_ctx);
+
 #endif  /* AVFILTER_AVFILTERGRAPH_H */

Modified: trunk/libavfilter/graphparser.c
==============================================================================
--- trunk/libavfilter/graphparser.c	Sun Nov  7 23:47:37 2010	(r25704)
+++ trunk/libavfilter/graphparser.c	Sun Nov  7 23:56:29 2010	(r25705)
@@ -24,7 +24,6 @@
 #include <string.h>
 
 #include "libavutil/avstring.h"
-#include "graphparser.h"
 #include "avfilter.h"
 #include "avfiltergraph.h"
 #include "parseutils.h"

Modified: trunk/tools/graph2dot.c
==============================================================================
--- trunk/tools/graph2dot.c	Sun Nov  7 23:47:37 2010	(r25704)
+++ trunk/tools/graph2dot.c	Sun Nov  7 23:56:29 2010	(r25705)
@@ -22,7 +22,7 @@
 
 #undef HAVE_AV_CONFIG_H
 #include "libavutil/pixdesc.h"
-#include "libavfilter/graphparser.h"
+#include "libavfilter/avfiltergraph.h"
 
 static void usage(void)
 {