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

[Andreas Rheinhardt]

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

It is not fully backwards-compatible API-wise: If you use a function
pointer for swr_alloc_set_opts2 by hardcoding its type, you will get
warnings now (or even errors depending upon your -Werror; it is an error
by default for C++). Given that I do not know about other language
bindings I have so far refrained from applying
https://patchwork.ffmpeg.org/project/ffmpeg/patch/AS1PR01MB95649A21F5F9A45D40E6AC1D8F1F9@AS1PR01MB9564.eurprd01.prod.exchangelabs.com/
This does not mean that I block your patch; to the contrary: If it
breaks nothing, I will apply the above patch after a month or so.

- Andreas

> ---
>  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 9b77ef65bf..123ac65693 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, \