[FFmpeg-cvslog] lswr: take const AVChannelLayout* in swr_alloc_set_opts2()

rcombs git at videolan.org
Thu Aug 25 02:31:13 EEST 2022


ffmpeg | branch: master | rcombs <rcombs at rcombs.me> | Fri Aug  5 15:57:31 2022 -0500| [9546b3a1cbcd94e9107f85c8f1d2175efc6cf083] | committer: rcombs

lswr: take const AVChannelLayout* in swr_alloc_set_opts2()

This is fully backwards-compatible in both ABI and API,
so it's only a minor bump.

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

 libswresample/swresample.c | 4 ++--
 libswresample/swresample.h | 4 ++--
 libswresample/version.h    | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/libswresample/swresample.c b/libswresample/swresample.c
index 601e691596..6f04d130d3 100644
--- a/libswresample/swresample.c
+++ b/libswresample/swresample.c
@@ -83,8 +83,8 @@ FF_ENABLE_DEPRECATION_WARNINGS
 #endif
 
 int swr_alloc_set_opts2(struct SwrContext **ps,
-                        AVChannelLayout *out_ch_layout, enum AVSampleFormat out_sample_fmt, int out_sample_rate,
-                        AVChannelLayout *in_ch_layout, enum AVSampleFormat  in_sample_fmt, int  in_sample_rate,
+                        const AVChannelLayout *out_ch_layout, enum AVSampleFormat out_sample_fmt, int out_sample_rate,
+                        const AVChannelLayout *in_ch_layout, enum AVSampleFormat  in_sample_fmt, int  in_sample_rate,
                         int log_offset, void *log_ctx) {
     struct SwrContext *s = *ps;
     int ret;
diff --git a/libswresample/swresample.h b/libswresample/swresample.h
index 26d42fab8d..980be65783 100644
--- a/libswresample/swresample.h
+++ b/libswresample/swresample.h
@@ -286,8 +286,8 @@ struct SwrContext *swr_alloc_set_opts(struct SwrContext *s,
  *         On error, the Swr context is freed and *ps set to NULL.
  */
 int swr_alloc_set_opts2(struct SwrContext **ps,
-                        AVChannelLayout *out_ch_layout, enum AVSampleFormat out_sample_fmt, int out_sample_rate,
-                        AVChannelLayout *in_ch_layout, enum AVSampleFormat  in_sample_fmt, int  in_sample_rate,
+                        const AVChannelLayout *out_ch_layout, enum AVSampleFormat out_sample_fmt, int out_sample_rate,
+                        const AVChannelLayout *in_ch_layout, enum AVSampleFormat  in_sample_fmt, int  in_sample_rate,
                         int log_offset, void *log_ctx);
 /**
  * @}
diff --git a/libswresample/version.h b/libswresample/version.h
index 66bac2fa9b..4b9952d914 100644
--- a/libswresample/version.h
+++ b/libswresample/version.h
@@ -30,7 +30,7 @@
 
 #include "version_major.h"
 
-#define LIBSWRESAMPLE_VERSION_MINOR   8
+#define LIBSWRESAMPLE_VERSION_MINOR   9
 #define LIBSWRESAMPLE_VERSION_MICRO 100
 
 #define LIBSWRESAMPLE_VERSION_INT  AV_VERSION_INT(LIBSWRESAMPLE_VERSION_MAJOR, \



More information about the ffmpeg-cvslog mailing list