diff options
author | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-09-05 16:11:22 +0200 |
---|---|---|
committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-09-05 16:11:22 +0200 |
commit | 43e2e172dfbd734947c30bdbfa8f19b7ca95576d (patch) | |
tree | ca119d48d13e8f9905f10b0cba11ddbb77f811d2 /libavfilter/avfilter.h | |
parent | 2751d5f0ba2e4da18fe72d91d317423f1662dd9b (diff) | |
parent | e65e4cbbda03ca3c9087f069c9867d518415fca1 (diff) |
Merge commit 'e65e4cbbda03ca3c9087f069c9867d518415fca1'
* commit 'e65e4cbbda03ca3c9087f069c9867d518415fca1':
lavfi: Drop deprecated *_count suffixed variables
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'libavfilter/avfilter.h')
-rw-r--r-- | libavfilter/avfilter.h | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/libavfilter/avfilter.h b/libavfilter/avfilter.h index 6684ab5aa8..15b90467f2 100644 --- a/libavfilter/avfilter.h +++ b/libavfilter/avfilter.h @@ -486,16 +486,10 @@ struct AVFilterContext { AVFilterPad *input_pads; ///< array of input pads AVFilterLink **inputs; ///< array of pointers to input links -#if FF_API_FOO_COUNT - attribute_deprecated unsigned input_count; ///< @deprecated use nb_inputs -#endif unsigned nb_inputs; ///< number of input pads AVFilterPad *output_pads; ///< array of output pads AVFilterLink **outputs; ///< array of pointers to output links -#if FF_API_FOO_COUNT - attribute_deprecated unsigned output_count; ///< @deprecated use nb_outputs -#endif unsigned nb_outputs; ///< number of output pads void *priv; ///< private data for use by the filter @@ -1017,20 +1011,11 @@ typedef int (avfilter_execute_func)(AVFilterContext *ctx, avfilter_action_func * typedef struct AVFilterGraph { const AVClass *av_class; -#if FF_API_FOO_COUNT - attribute_deprecated - unsigned filter_count_unused; -#endif AVFilterContext **filters; -#if !FF_API_FOO_COUNT unsigned nb_filters; -#endif char *scale_sws_opts; ///< sws options to use for the auto-inserted scale filters char *resample_lavr_opts; ///< libavresample options to use for the auto-inserted resample filters -#if FF_API_FOO_COUNT - unsigned nb_filters; -#endif /** * Type of multithreading allowed for filters in this graph. A combination |