diff options
author | Vitor Sessak <vitor1001@gmail.com> | 2008-04-04 20:09:06 +0000 |
---|---|---|
committer | Vitor Sessak <vitor1001@gmail.com> | 2008-04-04 20:09:06 +0000 |
commit | 0c3177737b401c319ec1a9f5a11da66deb8d0a95 (patch) | |
tree | b8bc77fee7150282c91c9abed4dfaf09785bf776 /libavfilter | |
parent | 87506daafddca7c73524a1be3440244e7c99340e (diff) | |
download | ffmpeg-streaming-0c3177737b401c319ec1a9f5a11da66deb8d0a95.zip ffmpeg-streaming-0c3177737b401c319ec1a9f5a11da66deb8d0a95.tar.gz |
Move mess (to be removed) to where it is actually used.
Commited in SoC by Vitor Sessak on 2008-03-26 20:56:05
Originally committed as revision 12739 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavfilter')
-rw-r--r-- | libavfilter/avfiltergraph.c | 43 | ||||
-rw-r--r-- | libavfilter/avfiltergraph.h | 53 |
2 files changed, 43 insertions, 53 deletions
diff --git a/libavfilter/avfiltergraph.c b/libavfilter/avfiltergraph.c index 62da23f..7acafe7 100644 --- a/libavfilter/avfiltergraph.c +++ b/libavfilter/avfiltergraph.c @@ -26,6 +26,49 @@ #include "avfilter.h" #include "avfiltergraph.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; + /** * For use in av_log */ diff --git a/libavfilter/avfiltergraph.h b/libavfilter/avfiltergraph.h index cadd091..ec1cf16 100644 --- a/libavfilter/avfiltergraph.h +++ b/libavfilter/avfiltergraph.h @@ -24,48 +24,6 @@ #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; @@ -84,12 +42,6 @@ typedef struct AVFilterGraph { int avfilter_graph_parse_chain(AVFilterGraph *graph, const char *filters, AVFilterContext *in, int inpad, AVFilterContext *out, int outpad); /** - * Free a filter graph description. - * @param desc The graph description to free - */ -void avfilter_graph_free_desc(AVFilterGraphDesc *desc); - -/** * Add an existing filter instance to a filter graph. * @param graph The filter graph * @param filter The filter to be added @@ -106,9 +58,4 @@ int avfilter_graph_config_formats(AVFilterGraph *graphctx); */ int avfilter_graph_config_links(AVFilterGraph *graphctx); - -int graph_load_from_desc3(AVFilterGraph *ctx, AVFilterGraphDesc *desc, - AVFilterContext *in, int inpad, - AVFilterContext *out, int outpad); - #endif /* FFMPEG_AVFILTERGRAPH_H */ |