This reverts commit 798dcf2432999f449c76c0e0fe2d7a4ee5eabbc2. It was applied by accident before it could be reviewed.
Unified · Split
| @@ -15,10 +15,6 @@ libavutil: 2017-10-21 · 14 unmodified lines | ||
| 15 | 15 | |
| 16 | 16 | API changes, most recent first: |
| 17 | 17 | |
| 18 | −2018-01-xx - xxxxxxx - lavfi 7.11.101 - avfilter.h | |
| 19 | − Deprecate avfilter_link_get_channels(), and make AVFilterLink->channels | |
| 20 | − public. | |
| 21 | − | |
| 22 | 18 | 2017-xx-xx - xxxxxxx - lavr 4.0.0 - avresample.h |
| 23 | 19 | Deprecate the entire library. Merged years ago to provide compatibility |
| 24 | 20 | with Libav, it remained unmaintained by the FFmpeg project and duplicated |
| @@ -183,12 +183,10 @@ void avfilter_link_free(AVFilterLink **link) · 182 unmodified lines | ||
| 183 | 183 | av_freep(link); |
| 184 | 184 | } |
| 185 | 185 | |
| 186 | −#if FF_API_FILTER_GET_SET | |
| 187 | 186 | int avfilter_link_get_channels(AVFilterLink *link) |
| 188 | 187 | { |
| 189 | 188 | return link->channels; |
| 190 | 189 | } |
| 191 | −#endif | |
| 192 | 190 | |
| 193 | 191 | void ff_filter_set_ready(AVFilterContext *filter, unsigned priority) |
| 194 | 192 | { |
| @@ -448,11 +448,6 @@ struct AVFilterLink { · 447 unmodified lines | ||
| 448 | 448 | */ |
| 449 | 449 | AVRational time_base; |
| 450 | 450 | |
| 451 | − /** | |
| 452 | − * Number of channels. | |
| 453 | − */ | |
| 454 | − int channels; | |
| 455 | − | |
| 456 | 451 | /***************************************************************** |
| 457 | 452 | * All fields below this line are not part of the public API. They |
| 458 | 453 | * may not be used outside of libavfilter and can be changed and |
| @@ -556,6 +551,11 @@ struct AVFilterLink { · 97 unmodified lines | ||
| 556 | 551 | */ |
| 557 | 552 | int max_samples; |
| 558 | 553 | |
| 554 | + /** | |
| 555 | + * Number of channels. | |
| 556 | + */ | |
| 557 | + int channels; | |
| 558 | + | |
| 559 | 559 | /** |
| 560 | 560 | * Link processing flags. |
| 561 | 561 | */ |
| @@ -647,15 +647,10 @@ int avfilter_link(AVFilterContext *src, unsigned srcpad, · 85 unmodified lines | ||
| 647 | 647 | */ |
| 648 | 648 | void avfilter_link_free(AVFilterLink **link); |
| 649 | 649 | |
| 650 | −#if FF_API_FILTER_GET_SET | |
| 651 | 650 | /** |
| 652 | 651 | * Get the number of channels of a link. |
| 653 | − * @deprecated This accessor used to be provided for ABI compatibility, and | |
| 654 | − * does not need to be used anymore. | |
| 655 | 652 | */ |
| 656 | −attribute_deprecated | |
| 657 | 653 | int avfilter_link_get_channels(AVFilterLink *link); |
| 658 | −#endif | |
| 659 | 654 | |
| 660 | 655 | /** |
| 661 | 656 | * Set the closed field of a link. |
| @@ -31,7 +31,7 @@ · 30 unmodified lines | ||
| 31 | 31 | |
| 32 | 32 | #define LIBAVFILTER_VERSION_MAJOR 7 |
| 33 | 33 | #define LIBAVFILTER_VERSION_MINOR 11 |
| 34 | −#define LIBAVFILTER_VERSION_MICRO 101 | |
| 34 | +#define LIBAVFILTER_VERSION_MICRO 100 | |
| 35 | 35 | |
| 36 | 36 | #define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \ |
| 37 | 37 | LIBAVFILTER_VERSION_MINOR, \ |
| @@ -55,8 +55,5 @@ · 17 unmodified lines | ||
| 55 | 55 | #ifndef FF_API_LAVR_OPTS |
| 56 | 56 | #define FF_API_LAVR_OPTS (LIBAVFILTER_VERSION_MAJOR < 8) |
| 57 | 57 | #endif |
| 58 | −#ifndef FF_API_FILTER_GET_SET | |
| 59 | −#define FF_API_FILTER_GET_SET (LIBAVFILTER_VERSION_MAJOR < 8) | |
| 60 | −#endif | |
| 61 | 58 | |
| 62 | 59 | #endif /* AVFILTER_VERSION_H */ |