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

@@ -662,12 +662,6 @@ AVFilterContext *ff_filter_alloc(const AVFilter *filter, const char *inst_name)
if (!ret->outputs)
goto err;
}
#if FF_API_FOO_COUNT
FF_DISABLE_DEPRECATION_WARNINGS
ret->output_count = ret->nb_outputs;
ret->input_count = ret->nb_inputs;
FF_ENABLE_DEPRECATION_WARNINGS
#endif
return ret;