diff options
| author | James Almer <jamrial@gmail.com> | 2018-01-05 22:13:28 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2018-01-05 22:13:28 -0300 |
| commit | da5b05c8335d2c29355b95257f466211d04ab81d (patch) | |
| tree | b870b246467f67a2d60560ba0b90ceed5e2d2771 /libavfilter/avfilter.h | |
| parent | 503164b54ba2f4fcc3ba829ee4ece43333998b15 (diff) | |
| download | ffmpeg-da5b05c8335d2c29355b95257f466211d04ab81d.tar.gz | |
Revert "avfilter: deprecate avfilter_link_get_channels()"
This reverts commit 798dcf2432999f449c76c0e0fe2d7a4ee5eabbc2.
It was applied by accident before it could be reviewed.
Diffstat (limited to 'libavfilter/avfilter.h')
| -rw-r--r-- | libavfilter/avfilter.h | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/libavfilter/avfilter.h b/libavfilter/avfilter.h index 410d8bbdd7..47546c15e5 100644 --- a/libavfilter/avfilter.h +++ b/libavfilter/avfilter.h @@ -448,11 +448,6 @@ 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 @@ -557,6 +552,11 @@ struct AVFilterLink { int max_samples; /** + * Number of channels. + */ + int channels; + + /** * Link processing flags. */ unsigned flags; @@ -647,15 +647,10 @@ 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. |