X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavfilter%2Favfiltergraph.h;h=c78d53f0a3a3e6e0f152c72706f6173e96f61b6d;hb=7a05b0a675f7089076e1972368c0ca4cbdc2a18a;hp=58afa04cea929c0be145a0aa341643d3347e314c;hpb=d2027baac5aaf078a4b7abf5d9d7b0dee4ea6b3b;p=ffmpeg

diff --git a/libavfilter/avfiltergraph.h b/libavfilter/avfiltergraph.h
index 58afa04cea9..c78d53f0a3a 100644
--- a/libavfilter/avfiltergraph.h
+++ b/libavfilter/avfiltergraph.h
@@ -19,41 +19,58 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef FFMPEG_AVFILTERGRAPH_H
-#define FFMPEG_AVFILTERGRAPH_H
+#ifndef AVFILTER_AVFILTERGRAPH_H
+#define AVFILTER_AVFILTERGRAPH_H
 
 #include "avfilter.h"
 
 typedef struct AVFilterGraph {
     unsigned filter_count;
     AVFilterContext **filters;
+
+    char *scale_sws_opts; ///< sws options to use for the auto-inserted scale filters
 } AVFilterGraph;
 
 /**
- * Get a pointer to a graph by instance name
+ * Gets a filter instance with name name from graph.
+ *
+ * @return the pointer to the found filter instance or NULL if it
+ * cannot be found.
  */
 AVFilterContext *avfilter_graph_get_filter(AVFilterGraph *graph, char *name);
 
 /**
- * Add an existing filter instance to a filter graph.
+ * Adds an existing filter instance to a filter graph.
  * @param graph  The filter graph
  * @param filter The filter to be added
  */
-void avfilter_graph_add_filter(AVFilterGraph *graphctx, AVFilterContext *filter);
+int avfilter_graph_add_filter(AVFilterGraph *graphctx, AVFilterContext *filter);
 
 /**
- * Configure the formats of all the links in the graph.
+ * Checks for the validity of graph.
+ *
+ * A graph is considered valid if all its input and output pads are
+ * connected.
+ *
+ * @return 0 in case of success, a negative value otherwise
  */
-int avfilter_graph_config_formats(AVFilterGraph *graphctx);
+int avfilter_graph_check_validity(AVFilterGraph *graphctx, AVClass *log_ctx);
 
 /**
- * Configure the parameters (resolution, etc) of all links in the graph.
+ * Configures all the links of graphctx.
+ *
+ * @return 0 in case of success, a negative value otherwise
  */
-int avfilter_graph_config_links(AVFilterGraph *graphctx);
+int avfilter_graph_config_links(AVFilterGraph *graphctx, AVClass *log_ctx);
+
+/**
+ * Configures the formats of all the links in the graph.
+ */
+int avfilter_graph_config_formats(AVFilterGraph *graphctx);
 
 /**
- * Free a graph and destroy its links.
+ * Frees a graph and destroys its links.
  */
-void avfilter_destroy_graph(AVFilterGraph *graph);
+void avfilter_graph_destroy(AVFilterGraph *graph);
 
-#endif  /* FFMPEG_AVFILTERGRAPH_H */
+#endif  /* AVFILTER_AVFILTERGRAPH_H */