diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-04 13:09:54 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-04 13:24:33 +0200 |
| commit | ab2989378fc59128b7e372fadceeb376c9e8cae0 (patch) | |
| tree | 5781feee90fe410edfa45f4441ddf152dc356e5e /libavfilter | |
| parent | e7389ed5d0bd13daf0af9ca7a4b9bc0d21aad9b1 (diff) | |
| parent | dbb1425811a672eddf4acf0513237cdf20f83756 (diff) | |
| download | ffmpeg-ab2989378fc59128b7e372fadceeb376c9e8cae0.tar.gz | |
Merge commit 'dbb1425811a672eddf4acf0513237cdf20f83756'
* commit 'dbb1425811a672eddf4acf0513237cdf20f83756':
lavf: make sure stream probe data gets freed.
avfiltergraph: set deprecated filter_count.
Conflicts:
libavformat/utils.c
See: 44a7a6300d104dd453bcd5c601e9c6944fb34679
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter')
| -rw-r--r-- | libavfilter/avfiltergraph.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libavfilter/avfiltergraph.c b/libavfilter/avfiltergraph.c index 0101d650a6..75e828feeb 100644 --- a/libavfilter/avfiltergraph.c +++ b/libavfilter/avfiltergraph.c @@ -84,6 +84,10 @@ int avfilter_graph_add_filter(AVFilterGraph *graph, AVFilterContext *filter) graph->filters = filters; graph->filters[graph->nb_filters++] = filter; +#if FF_API_FOO_COUNT + graph->filter_count_unused = graph->nb_filters; +#endif + return 0; } |