* commit 'e65e4cbbda03ca3c9087f069c9867d518415fca1': lavfi: Drop deprecated *_count suffixed variables
Showing the changes to libavfilter/avfilter.h (1 of 5 files). Show all
Unified · Split
| @@ -486,16 +486,10 @@ struct AVFilterContext { · 485 unmodified lines | |||
| 486 | 486 | ||
| 487 | AVFilterPad *input_pads; ///< array of input pads | 487 | AVFilterPad *input_pads; ///< array of input pads |
| 488 | AVFilterLink **inputs; ///< array of pointers to input links | 488 | AVFilterLink **inputs; ///< array of pointers to input links |
| 489 | #if FF_API_FOO_COUNT | ||
| 490 | attribute_deprecated unsigned input_count; ///< @deprecated use nb_inputs | ||
| 491 | #endif | ||
| 492 | unsigned nb_inputs; ///< number of input pads | 489 | unsigned nb_inputs; ///< number of input pads |
| 493 | 490 | ||
| 494 | AVFilterPad *output_pads; ///< array of output pads | 491 | AVFilterPad *output_pads; ///< array of output pads |
| 495 | AVFilterLink **outputs; ///< array of pointers to output links | 492 | AVFilterLink **outputs; ///< array of pointers to output links |
| 496 | #if FF_API_FOO_COUNT | ||
| 497 | attribute_deprecated unsigned output_count; ///< @deprecated use nb_outputs | ||
| 498 | #endif | ||
| 499 | unsigned nb_outputs; ///< number of output pads | 493 | unsigned nb_outputs; ///< number of output pads |
| 500 | 494 | ||
| 501 | void *priv; ///< private data for use by the filter | 495 | void *priv; ///< private data for use by the filter |
| @@ -1017,20 +1011,11 @@ typedef int (avfilter_execute_func)(AVFilterContext *ctx, avfilter_action_func * · 515 unmodified lines | |||
| 1017 | 1011 | ||
| 1018 | typedef struct AVFilterGraph { | 1012 | typedef struct AVFilterGraph { |
| 1019 | const AVClass *av_class; | 1013 | const AVClass *av_class; |
| 1020 | #if FF_API_FOO_COUNT | ||
| 1021 | attribute_deprecated | ||
| 1022 | unsigned filter_count_unused; | ||
| 1023 | #endif | ||
| 1024 | AVFilterContext **filters; | 1014 | AVFilterContext **filters; |
| 1025 | #if !FF_API_FOO_COUNT | ||
| 1026 | unsigned nb_filters; | 1015 | unsigned nb_filters; |
| 1027 | #endif | ||
| 1028 | 1016 | ||
| 1029 | char *scale_sws_opts; ///< sws options to use for the auto-inserted scale filters | 1017 | char *scale_sws_opts; ///< sws options to use for the auto-inserted scale filters |
| 1030 | char *resample_lavr_opts; ///< libavresample options to use for the auto-inserted resample filters | 1018 | char *resample_lavr_opts; ///< libavresample options to use for the auto-inserted resample filters |
| 1031 | #if FF_API_FOO_COUNT | ||
| 1032 | unsigned nb_filters; | ||
| 1033 | #endif | ||
| 1034 | 1019 | ||
| 1035 | /** | 1020 | /** |
| 1036 | * Type of multithreading allowed for filters in this graph. A combination | 1021 | * Type of multithreading allowed for filters in this graph. A combination |