diff options
| author | James Almer <jamrial@gmail.com> | 2018-01-05 17:49:09 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2018-01-05 17:49:09 -0300 |
| commit | 798dcf2432999f449c76c0e0fe2d7a4ee5eabbc2 (patch) | |
| tree | ee5a53a9e9b9f34907b363a0a3a1a4ed6079a251 | |
| parent | b9ad04b19c0c7244cc3788f3fa45e9fbe0b620a8 (diff) | |
| download | ffmpeg-798dcf2432999f449c76c0e0fe2d7a4ee5eabbc2.tar.gz | |
avfilter: deprecate avfilter_link_get_channels()
And move the channels field to the public section of the struct.
Signed-off-by: James Almer <jamrial@gmail.com>
| -rw-r--r-- | doc/APIchanges | 4 | ||||
| -rw-r--r-- | libavfilter/avfilter.c | 2 | ||||
| -rw-r--r-- | libavfilter/avfilter.h | 15 | ||||
| -rw-r--r-- | libavfilter/version.h | 5 |
4 files changed, 20 insertions, 6 deletions
diff --git a/doc/APIchanges b/doc/APIchanges index 38c1be61c7..6e48c8707e 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -15,6 +15,10 @@ libavutil: 2017-10-21 API changes, most recent first: +2018-01-xx - xxxxxxx - lavfi 7.11.101 - avfilter.h + Deprecate avfilter_link_get_channels(), and make AVFilterLink->channels + public. + 2017-xx-xx - xxxxxxx - lavr 4.0.0 - avresample.h Deprecate the entire library. Merged years ago to provide compatibility with Libav, it remained unmaintained by the FFmpeg project and duplicated diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c index ff7df672fd..ea75467a75 100644 --- a/libavfilter/avfilter.c +++ b/libavfilter/avfilter.c @@ -183,10 +183,12 @@ void avfilter_link_free(AVFilterLink **link) av_freep(link); } +#if FF_API_FILTER_GET_SET int avfilter_link_get_channels(AVFilterLink *link) { return link->channels; } +#endif void ff_filter_set_ready(AVFilterContext *filter, unsigned priority) { diff --git a/libavfilter/avfilter.h b/libavfilter/avfilter.h index 47546c15e5..410d8bbdd7 100644 --- a/libavfilter/avfilter.h +++ b/libavfilter/avfilter.h @@ -448,6 +448,11 @@ struct AVFilterLink { */ AVRational time_base; + /** + * Number of channels. + */ + int channels; + /***************************************************************** * All fields below this line are not part of the public API. They * may not be used outside of libavfilter and can be changed and @@ -552,11 +557,6 @@ struct AVFilterLink { int max_samples; /** - * Number of channels. - */ - int channels; - - /** * Link processing flags. */ unsigned flags; @@ -647,10 +647,15 @@ int avfilter_link(AVFilterContext *src, unsigned srcpad, */ void avfilter_link_free(AVFilterLink **link); +#if FF_API_FILTER_GET_SET /** * Get the number of channels of a link. + * @deprecated This accessor used to be provided for ABI compatibility, and + * does not need to be used anymore. */ +attribute_deprecated int avfilter_link_get_channels(AVFilterLink *link); +#endif /** * Set the closed field of a link. diff --git a/libavfilter/version.h b/libavfilter/version.h index c07f4d30d9..0f11721822 100644 --- a/libavfilter/version.h +++ b/libavfilter/version.h @@ -31,7 +31,7 @@ #define LIBAVFILTER_VERSION_MAJOR 7 #define LIBAVFILTER_VERSION_MINOR 11 -#define LIBAVFILTER_VERSION_MICRO 100 +#define LIBAVFILTER_VERSION_MICRO 101 #define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \ LIBAVFILTER_VERSION_MINOR, \ @@ -55,5 +55,8 @@ #ifndef FF_API_LAVR_OPTS #define FF_API_LAVR_OPTS (LIBAVFILTER_VERSION_MAJOR < 8) #endif +#ifndef FF_API_FILTER_GET_SET +#define FF_API_FILTER_GET_SET (LIBAVFILTER_VERSION_MAJOR < 8) +#endif #endif /* AVFILTER_VERSION_H */ |