diff options
| author | James Almer <jamrial@gmail.com> | 2018-01-05 17:49:09 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2018-01-06 11:01:16 -0300 |
| commit | b2c42fc6dc3502a8b6cae441c54d898972a51cff (patch) | |
| tree | 393d3dec87478b372b1287b00ace716f49107f7a | |
| parent | 50b3cd22dd70658b39abd0ced31b495d4d0a4b1b (diff) | |
| download | ffmpeg-b2c42fc6dc3502a8b6cae441c54d898972a51cff.tar.gz | |
avfilter: deprecate avfilter_link_get_channels()
Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: James Almer <jamrial@gmail.com>
| -rw-r--r-- | doc/APIchanges | 3 | ||||
| -rw-r--r-- | libavfilter/avfilter.c | 2 | ||||
| -rw-r--r-- | libavfilter/avfilter.h | 4 | ||||
| -rw-r--r-- | libavfilter/version.h | 5 |
4 files changed, 13 insertions, 1 deletions
diff --git a/doc/APIchanges b/doc/APIchanges index 38c1be61c7..d66c842521 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -15,6 +15,9 @@ libavutil: 2017-10-21 API changes, most recent first: +2018-01-xx - xxxxxxx - lavfi 7.11.101 - avfilter.h + Deprecate avfilter_link_get_channels(). Use av_buffersink_get_channels(). + 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..62eed2168f 100644 --- a/libavfilter/avfilter.h +++ b/libavfilter/avfilter.h @@ -647,10 +647,14 @@ 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 Use av_buffersink_get_channels() */ +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 */ |