avfilter: remove FF_API_PAD_COUNT

Signed-off-by: James Almer <jamrial@gmail.com>
release/6.0
James Almer 2 years ago committed by Anton Khirnov
parent 863822bfaf
commit 8bc0d31320
  1. 21
      libavfilter/avfilter.c
  2. 10
      libavfilter/avfilter.h
  3. 2
      libavfilter/version_major.h

@ -560,27 +560,6 @@ int avfilter_process_command(AVFilterContext *filter, const char *cmd, const cha
return AVERROR(ENOSYS); return AVERROR(ENOSYS);
} }
#if FF_API_PAD_COUNT
int avfilter_pad_count(const AVFilterPad *pads)
{
const AVFilter *filter;
void *opaque = NULL;
if (!pads)
return 0;
while (filter = av_filter_iterate(&opaque)) {
if (pads == filter->inputs)
return filter->nb_inputs;
if (pads == filter->outputs)
return filter->nb_outputs;
}
av_assert0(!"AVFilterPad list not from a filter");
return AVERROR_BUG;
}
#endif
unsigned avfilter_filter_pad_count(const AVFilter *filter, int is_output) unsigned avfilter_filter_pad_count(const AVFilter *filter, int is_output)
{ {
return is_output ? filter->nb_outputs : filter->nb_inputs; return is_output ? filter->nb_outputs : filter->nb_inputs;

@ -76,16 +76,6 @@ typedef struct AVFilterPad AVFilterPad;
typedef struct AVFilterFormats AVFilterFormats; typedef struct AVFilterFormats AVFilterFormats;
typedef struct AVFilterChannelLayouts AVFilterChannelLayouts; typedef struct AVFilterChannelLayouts AVFilterChannelLayouts;
#if FF_API_PAD_COUNT
/**
* Get the number of elements in an AVFilter's inputs or outputs array.
*
* @deprecated Use avfilter_filter_pad_count() instead.
*/
attribute_deprecated
int avfilter_pad_count(const AVFilterPad *pads);
#endif
/** /**
* Get the name of an AVFilterPad. * Get the name of an AVFilterPad.
* *

@ -35,6 +35,4 @@
* the public API and may change, break or disappear at any time. * the public API and may change, break or disappear at any time.
*/ */
#define FF_API_PAD_COUNT (LIBAVFILTER_VERSION_MAJOR < 9)
#endif /* AVFILTER_VERSION_MAJOR_H */ #endif /* AVFILTER_VERSION_MAJOR_H */

Loading…
Cancel
Save