Merge commit 'e65e4cbbda03ca3c9087f069c9867d518415fca1'

* commit 'e65e4cbbda03ca3c9087f069c9867d518415fca1':
  lavfi: Drop deprecated *_count suffixed variables

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
This commit is contained in:
Hendrik Leppkes
2015-09-05 16:11:22 +02:00
5 changed files with 2 additions and 50 deletions

View File

@@ -135,12 +135,6 @@ int avfilter_graph_add_filter(AVFilterGraph *graph, AVFilterContext *filter)
graph->filters = filters;
graph->filters[graph->nb_filters++] = filter;
#if FF_API_FOO_COUNT
FF_DISABLE_DEPRECATION_WARNINGS
graph->filter_count_unused = graph->nb_filters;
FF_ENABLE_DEPRECATION_WARNINGS
#endif
filter->graph = graph;
return 0;
@@ -206,12 +200,6 @@ AVFilterContext *avfilter_graph_alloc_filter(AVFilterGraph *graph,
graph->filters = filters;
graph->filters[graph->nb_filters++] = s;
#if FF_API_FOO_COUNT
FF_DISABLE_DEPRECATION_WARNINGS
graph->filter_count_unused = graph->nb_filters;
FF_ENABLE_DEPRECATION_WARNINGS
#endif
s->graph = graph;
return s;