aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolas George <nicolas.george@normalesup.org>2012-05-18 12:44:11 +0200
committerNicolas George <nicolas.george@normalesup.org>2012-05-19 10:59:52 +0200
commit9567f410aa9c9f727cd123a5d78c773e99798ee4 (patch)
tree012db91841bc4fb80f3609c12b9d25a536d588a2
parent31dfe20dd2fe16c2a3a6816d140b8a32dbdc06ba (diff)
downloadffmpeg-9567f410aa9c9f727cd123a5d78c773e99798ee4.tar.gz
avfilter: move some fields in AVFilterLink.
It restores ABI compatibility with libav. The fields that move were very recent or morally private.
-rw-r--r--libavfilter/avfilter.h31
1 files changed, 16 insertions, 15 deletions
diff --git a/libavfilter/avfilter.h b/libavfilter/avfilter.h
index 124f3e67a5..fe7140acdd 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;
};
/**