[FFmpeg-devel] [PATCH 2/5] avfilter: move some fields in AVFilterLink.

Nicolas George nicolas.george at normalesup.org
Fri May 18 15:15:38 CEST 2012


It restores ABI compatibility with libav.

The fields that move were very recent or morally private.

Signed-off-by: Nicolas George <nicolas.george at normalesup.org>
---
 libavfilter/avfilter.h |   31 ++++++++++++++++---------------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/libavfilter/avfilter.h b/libavfilter/avfilter.h
index b588118..2c88d00 100644
--- a/libavfilter/avfilter.h
+++ b/libavfilter/avfilter.h
@@ -705,6 +705,22 @@ struct AVFilterLink {
      */
     AVRational time_base;
 
+    /*****************************************************************
+     * 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
+     * removed at will.
+     * New public fields should be added right above.
+     *****************************************************************
+     */
+    /**
+     * Lists of channel layouts and sample rates used for automatic
+     * negotiation.
+     */
+    AVFilterFormats  *in_samplerates;
+    AVFilterFormats *out_samplerates;
+    struct AVFilterChannelLayouts  *in_channel_layouts;
+    struct AVFilterChannelLayouts *out_channel_layouts;
+
     struct AVFilterPool *pool;
 
     /**
@@ -718,26 +734,11 @@ struct AVFilterLink {
      */
     int64_t current_pts;
 
-    /*****************************************************************
-     * 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
-     * removed at will.
-     * New public fields should be added right above.
-     *****************************************************************
-     */
     /**
      * Index in the age array.
      */
     int age_index;
 
-    /**
-     * Lists of channel layouts and sample rates used for automatic
-     * negotiation.
-     */
-    AVFilterFormats  *in_samplerates;
-    AVFilterFormats *out_samplerates;
-    struct AVFilterChannelLayouts  *in_channel_layouts;
-    struct AVFilterChannelLayouts *out_channel_layouts;
 };
 
 /**
-- 
1.7.10



More information about the ffmpeg-devel mailing list