* commit '42c7c61ab25809620b8c8809b3da73e25f5bbaaf': avfiltergraph: replace AVFilterGraph.filter_count with nb_filters Conflicts: doc/APIchanges libavfilter/avfiltergraph.c libavfilter/avfiltergraph.h libavfilter/graphparser.c libavfilter/version.h
Showing the changes to libavfilter/avfiltergraph.h (1 of 7 files). Show all
Unified · Split
| @@ -27,11 +27,20 @@ · 26 unmodified lines | |||
| 27 | 27 | ||
| 28 | typedef struct AVFilterGraph { | 28 | typedef struct AVFilterGraph { |
| 29 | const AVClass *av_class; | 29 | const AVClass *av_class; |
| 30 | unsigned filter_count; | 30 | #if FF_API_FOO_COUNT |
| 31 | attribute_deprecated | ||
| 32 | unsigned filter_count_unused; | ||
| 33 | #endif | ||
| 31 | AVFilterContext **filters; | 34 | AVFilterContext **filters; |
| 35 | #if !FF_API_FOO_COUNT | ||
| 36 | unsigned nb_filters; | ||
| 37 | #endif | ||
| 32 | 38 | ||
| 33 | char *scale_sws_opts; ///< sws options to use for the auto-inserted scale filters | 39 | char *scale_sws_opts; ///< sws options to use for the auto-inserted scale filters |
| 34 | char *resample_lavr_opts; ///< libavresample options to use for the auto-inserted resample filters | 40 | char *resample_lavr_opts; ///< libavresample options to use for the auto-inserted resample filters |
| 41 | #if FF_API_FOO_COUNT | ||
| 42 | unsigned nb_filters; | ||
| 43 | #endif | ||
| 35 | char *aresample_swr_opts; ///< swr options to use for the auto-inserted aresample filters, Access ONLY through AVOptions | 44 | char *aresample_swr_opts; ///< swr options to use for the auto-inserted aresample filters, Access ONLY through AVOptions |
| 36 | 45 | ||
| 37 | /** | 46 | /** |