* commit 'e65e4cbbda03ca3c9087f069c9867d518415fca1': lavfi: Drop deprecated *_count suffixed variables
Unified · Split
| @@ -662,12 +662,6 @@ AVFilterContext *ff_filter_alloc(const AVFilter *filter, const char *inst_name) · 661 unmodified lines | |||
| 662 | if (!ret->outputs) | 662 | if (!ret->outputs) |
| 663 | goto err; | 663 | goto err; |
| 664 | } | 664 | } |
| 665 | #if FF_API_FOO_COUNT | ||
| 666 | FF_DISABLE_DEPRECATION_WARNINGS | ||
| 667 | ret->output_count = ret->nb_outputs; | ||
| 668 | ret->input_count = ret->nb_inputs; | ||
| 669 | FF_ENABLE_DEPRECATION_WARNINGS | ||
| 670 | #endif | ||
| 671 | 665 | ||
| 672 | return ret; | 666 | return ret; |
| 673 | 667 | ||
| @@ -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 |
| @@ -135,12 +135,6 @@ int avfilter_graph_add_filter(AVFilterGraph *graph, AVFilterContext *filter) · 134 unmodified lines | |||
| 135 | graph->filters = filters; | 135 | graph->filters = filters; |
| 136 | graph->filters[graph->nb_filters++] = filter; | 136 | graph->filters[graph->nb_filters++] = filter; |
| 137 | 137 | ||
| 138 | #if FF_API_FOO_COUNT | ||
| 139 | FF_DISABLE_DEPRECATION_WARNINGS | ||
| 140 | graph->filter_count_unused = graph->nb_filters; | ||
| 141 | FF_ENABLE_DEPRECATION_WARNINGS | ||
| 142 | #endif | ||
| 143 | |||
| 144 | filter->graph = graph; | 138 | filter->graph = graph; |
| 145 | 139 | ||
| 146 | return 0; | 140 | return 0; |
| @@ -206,12 +200,6 @@ AVFilterContext *avfilter_graph_alloc_filter(AVFilterGraph *graph, · 59 unmodified lines | |||
| 206 | graph->filters = filters; | 200 | graph->filters = filters; |
| 207 | graph->filters[graph->nb_filters++] = s; | 201 | graph->filters[graph->nb_filters++] = s; |
| 208 | 202 | ||
| 209 | #if FF_API_FOO_COUNT | ||
| 210 | FF_DISABLE_DEPRECATION_WARNINGS | ||
| 211 | graph->filter_count_unused = graph->nb_filters; | ||
| 212 | FF_ENABLE_DEPRECATION_WARNINGS | ||
| 213 | #endif | ||
| 214 | |||
| 215 | s->graph = graph; | 203 | s->graph = graph; |
| 216 | 204 | ||
| 217 | return s; | 205 | return s; |
| @@ -269,28 +269,16 @@ int ff_insert_pad(unsigned idx, unsigned *count, size_t padidx_off, · 268 unmodified lines | |||
| 269 | static inline int ff_insert_inpad(AVFilterContext *f, unsigned index, | 269 | static inline int ff_insert_inpad(AVFilterContext *f, unsigned index, |
| 270 | AVFilterPad *p) | 270 | AVFilterPad *p) |
| 271 | { | 271 | { |
| 272 | int ret = ff_insert_pad(index, &f->nb_inputs, offsetof(AVFilterLink, dstpad), | 272 | return ff_insert_pad(index, &f->nb_inputs, offsetof(AVFilterLink, dstpad), |
| 273 | &f->input_pads, &f->inputs, p); | 273 | &f->input_pads, &f->inputs, p); |
| 274 | #if FF_API_FOO_COUNT | ||
| 275 | FF_DISABLE_DEPRECATION_WARNINGS | ||
| 276 | f->input_count = f->nb_inputs; | ||
| 277 | FF_ENABLE_DEPRECATION_WARNINGS | ||
| 278 | #endif | ||
| 279 | return ret; | ||
| 280 | } | 274 | } |
| 281 | 275 | ||
| 282 | /** Insert a new output pad for the filter. */ | 276 | /** Insert a new output pad for the filter. */ |
| 283 | static inline int ff_insert_outpad(AVFilterContext *f, unsigned index, | 277 | static inline int ff_insert_outpad(AVFilterContext *f, unsigned index, |
| 284 | AVFilterPad *p) | 278 | AVFilterPad *p) |
| 285 | { | 279 | { |
| 286 | int ret = ff_insert_pad(index, &f->nb_outputs, offsetof(AVFilterLink, srcpad), | 280 | return ff_insert_pad(index, &f->nb_outputs, offsetof(AVFilterLink, srcpad), |
| 287 | &f->output_pads, &f->outputs, p); | 281 | &f->output_pads, &f->outputs, p); |
| 288 | #if FF_API_FOO_COUNT | ||
| 289 | FF_DISABLE_DEPRECATION_WARNINGS | ||
| 290 | f->output_count = f->nb_outputs; | ||
| 291 | FF_ENABLE_DEPRECATION_WARNINGS | ||
| 292 | #endif | ||
| 293 | return ret; | ||
| 294 | } | 282 | } |
| 295 | 283 | ||
| 296 | /** | 284 | /** |
| @@ -49,9 +49,6 @@ · 48 unmodified lines | |||
| 49 | * the public API and may change, break or disappear at any time. | 49 | * the public API and may change, break or disappear at any time. |
| 50 | */ | 50 | */ |
| 51 | 51 | ||
| 52 | #ifndef FF_API_FOO_COUNT | ||
| 53 | #define FF_API_FOO_COUNT (LIBAVFILTER_VERSION_MAJOR < 6) | ||
| 54 | #endif | ||
| 55 | #ifndef FF_API_AVFILTERBUFFER | 52 | #ifndef FF_API_AVFILTERBUFFER |
| 56 | #define FF_API_AVFILTERBUFFER (LIBAVFILTER_VERSION_MAJOR < 6) | 53 | #define FF_API_AVFILTERBUFFER (LIBAVFILTER_VERSION_MAJOR < 6) |
| 57 | #endif | 54 | #endif |