@@ -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;

@@ -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

@@ -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;

@@ -269,28 +269,16 @@ int ff_insert_pad(unsigned idx, unsigned *count, size_t padidx_off,

 static inline int ff_insert_inpad(AVFilterContext *f, unsigned index,

                                    AVFilterPad *p)

 {

-    int ret = ff_insert_pad(index, &f->nb_inputs, offsetof(AVFilterLink, dstpad),

+    return ff_insert_pad(index, &f->nb_inputs, offsetof(AVFilterLink, dstpad),

                   &f->input_pads, &f->inputs, p);

-#if FF_API_FOO_COUNT

-FF_DISABLE_DEPRECATION_WARNINGS

-    f->input_count = f->nb_inputs;

-FF_ENABLE_DEPRECATION_WARNINGS

-#endif

-    return ret;

 }

 /** Insert a new output pad for the filter. */

 static inline int ff_insert_outpad(AVFilterContext *f, unsigned index,

                                     AVFilterPad *p)

 {

-    int ret = ff_insert_pad(index, &f->nb_outputs, offsetof(AVFilterLink, srcpad),

+    return ff_insert_pad(index, &f->nb_outputs, offsetof(AVFilterLink, srcpad),

                   &f->output_pads, &f->outputs, p);

-#if FF_API_FOO_COUNT

-FF_DISABLE_DEPRECATION_WARNINGS

-    f->output_count = f->nb_outputs;

-FF_ENABLE_DEPRECATION_WARNINGS

-#endif

-    return ret;

 }

 /**

@@ -49,9 +49,6 @@

  * the public API and may change, break or disappear at any time.

  */

-#ifndef FF_API_FOO_COUNT

-#define FF_API_FOO_COUNT                    (LIBAVFILTER_VERSION_MAJOR < 6)

-#endif

 #ifndef FF_API_AVFILTERBUFFER

 #define FF_API_AVFILTERBUFFER               (LIBAVFILTER_VERSION_MAJOR < 6)

 #endif