oggenc: check for failed av_mallocz()

[ffmpeg] / libavfilter / avfiltergraph.h

diff --git a/libavfilter/avfiltergraph.h b/libavfilter/avfiltergraph.h
index cadd09141fc7bbdde571e867a78a821491be4224..c78d53f0a3a3e6e0f152c72706f6173e96f61b6d 100644 (file)
--- a/libavfilter/avfiltergraph.h
+++ b/libavfilter/avfiltergraph.h
@@ -19,96 +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"
 
-/** Linked-list of filters to create for an AVFilterGraphDesc */
-typedef struct AVFilterGraphDescFilter
-{
-    int index;              ///< filter instance index
-    char *filter;           ///< name of filter type
-    char *args;             ///< filter parameters
-    struct AVFilterGraphDescFilter *next;
-} AVFilterGraphDescFilter;
-
-/** Linked-list of links between filters */
-typedef struct AVFilterGraphDescLink
-{
-    /* TODO: allow referencing pads by name, not just by index */
-    int src;                ///< index of the source filter
-    unsigned srcpad;        ///< index of the output pad on the source filter
-
-    int dst;                ///< index of the dest filter
-    unsigned dstpad;        ///< index of the input pad on the dest filter
-
-    struct AVFilterGraphDescLink *next;
-} AVFilterGraphDescLink;
-
-/** Linked-list of filter pads to be exported from the graph */
-typedef struct AVFilterGraphDescExport
-{
-    /* TODO: allow referencing pads by name, not just by index */
-    char *name;             ///< name of the exported pad
-    int filter;             ///< index of the filter
-    unsigned pad;           ///< index of the pad to be exported
-
-    struct AVFilterGraphDescExport *next;
-} AVFilterGraphDescExport;
-
-/** Description of a graph to be loaded from a file, etc */
-typedef struct
-{
-    AVFilterGraphDescFilter *filters;   ///< filters in the graph
-    AVFilterGraphDescLink   *links;     ///< links between the filters
-    AVFilterGraphDescExport *inputs;    ///< inputs to export
-    AVFilterGraphDescExport *outputs;   ///< outputs to export
-} AVFilterGraphDesc;
-
 typedef struct AVFilterGraph {
     unsigned filter_count;
     AVFilterContext **filters;
-} AVFilterGraph;
 
-/**
- * Add to a graph a graph described by a string.
- * @param graph   the filter graph where to link the parsed graph context
- * @param filters string to be parsed
- * @param in      input to the graph to be parsed (TODO: allow several)
- * @param inpad   pad index of the input
- * @param in      output to the graph to be parsed (TODO: allow several)
- * @param inpad   pad index of the output
- * @return        zero on success, -1 on error
- */
-int avfilter_graph_parse_chain(AVFilterGraph *graph, const char *filters, AVFilterContext *in, int inpad, AVFilterContext *out, int outpad);
+    char *scale_sws_opts; ///< sws options to use for the auto-inserted scale filters
+} AVFilterGraph;
 
 /**
- * Free a filter graph description.
- * @param desc The graph description to free
+ * Gets a filter instance with name name from graph.
+ *
+ * @return the pointer to the found filter instance or NULL if it
+ * cannot be found.
  */
-void avfilter_graph_free_desc(AVFilterGraphDesc *desc);
+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);
 
-int graph_load_from_desc3(AVFilterGraph *ctx, AVFilterGraphDesc *desc,
-                          AVFilterContext *in, int inpad,
-                          AVFilterContext *out, int outpad);
+/**
+ * Frees a graph and destroys its links.
+ */
+void avfilter_graph_destroy(AVFilterGraph *graph);
 
-#endif  /* FFMPEG_AVFILTERGRAPH_H */
+#endif  /* AVFILTER_AVFILTERGRAPH_H */