[FFmpeg-cvslog] Revert "avfilter: deprecate avfilter_link_get_channels()"

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Fri Jan  5 22:13:28 2018 -0300| [da5b05c8335d2c29355b95257f466211d04ab81d] | committer: James Almer

Revert "avfilter: deprecate avfilter_link_get_channels()"

This reverts commit 798dcf2432999f449c76c0e0fe2d7a4ee5eabbc2.

It was applied by accident before it could be reviewed.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=da5b05c8335d2c29355b95257f466211d04ab81d
---

 doc/APIchanges         |  4 ----
 libavfilter/avfilter.c |  2 --
 libavfilter/avfilter.h | 15 +++++----------
 libavfilter/version.h  |  5 +----
 4 files changed, 6 insertions(+), 20 deletions(-)

diff --git a/doc/APIchanges b/doc/APIchanges
index 6e48c8707e..38c1be61c7 100644
--- a/doc/APIchanges
+++ b/doc/APIchanges
@@ -15,10 +15,6 @@ 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 ea75467a75..ff7df672fd 100644
--- a/libavfilter/avfilter.c
+++ b/libavfilter/avfilter.c
@@ -183,12 +183,10 @@ 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 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.
diff --git a/libavfilter/version.h b/libavfilter/version.h
index 0f11721822..c07f4d30d9 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 101
+#define LIBAVFILTER_VERSION_MICRO 100
 
 #define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \
                                                LIBAVFILTER_VERSION_MINOR, \
@@ -55,8 +55,5 @@
 #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 */