virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

Merge commit '111367263af41c88a44bd763ceefc11d53a7f655'

Browse Source 
* commit '111367263af41c88a44bd763ceefc11d53a7f655':
  lavfi: add AVFilterContext.graph.

Conflicts:
	libavfilter/avfilter.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-04-12 00:44:18 +02:00
commit 4fde705396
3 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/APIchanges
View File

@ -161,6 +161,8 @@ API changes, most recent first:
avfilterhraph.h, user applications should include just avfilter.h avfilterhraph.h, user applications should include just avfilter.h
Add avfilter_graph_alloc_filter(), deprecate avfilter_open() and Add avfilter_graph_alloc_filter(), deprecate avfilter_open() and
avfilter_graph_add_filter(). avfilter_graph_add_filter().
Add AVFilterContext.graph pointing to the AVFilterGraph that contains the
filter.
2013-xx-xx - lavfi 3.7.0 - avfilter.h 2013-xx-xx - lavfi 3.7.0 - avfilter.h
Add AVFilter.priv_class for exporting filter options through the AVOptions API Add AVFilter.priv_class for exporting filter options through the AVOptions API

2
libavfilter/avfilter.h
View File

@ -527,6 +527,8 @@ struct AVFilterContext {
void *priv; ///< private data for use by the filter void *priv; ///< private data for use by the filter
struct AVFilterGraph *graph; ///< filtergraph this filter belongs to
struct AVFilterCommand *command_queue; struct AVFilterCommand *command_queue;
}; };

4
libavfilter/avfiltergraph.c
View File

@ -88,6 +88,8 @@ int avfilter_graph_add_filter(AVFilterGraph *graph, AVFilterContext *filter)
graph->filter_count_unused = graph->nb_filters; graph->filter_count_unused = graph->nb_filters;
#endif #endif
filter->graph = graph;
return 0; return 0;
} }
#endif #endif
@ -143,6 +145,8 @@ AVFilterContext *avfilter_graph_alloc_filter(AVFilterGraph *graph,
graph->filter_count_unused = graph->nb_filters; graph->filter_count_unused = graph->nb_filters;
#endif #endif
s->graph = graph;
return s; return s;
} }