RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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.
This commit is contained in:
rcombs 2022-08-05 15:57:31 -05:00
parent 22514527d3
commit 9546b3a1cb
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libswresample/swresample.c
View File

@ -83,8 +83,8 @@ FF_ENABLE_DEPRECATION_WARNINGS
#endif #endif
int swr_alloc_set_opts2(struct SwrContext **ps, int swr_alloc_set_opts2(struct SwrContext **ps,
AVChannelLayout *out_ch_layout, enum AVSampleFormat out_sample_fmt, int out_sample_rate, const 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 *in_ch_layout, enum AVSampleFormat in_sample_fmt, int in_sample_rate,
int log_offset, void *log_ctx) { int log_offset, void *log_ctx) {
struct SwrContext *s = *ps; struct SwrContext *s = *ps;
int ret; int ret;

4
libswresample/swresample.h
View File

@ -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. * On error, the Swr context is freed and *ps set to NULL.
*/ */
int swr_alloc_set_opts2(struct SwrContext **ps, int swr_alloc_set_opts2(struct SwrContext **ps,
AVChannelLayout *out_ch_layout, enum AVSampleFormat out_sample_fmt, int out_sample_rate, const 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 *in_ch_layout, enum AVSampleFormat in_sample_fmt, int in_sample_rate,
int log_offset, void *log_ctx); int log_offset, void *log_ctx);
/** /**
* @} * @}

2
libswresample/version.h
View File

@ -30,7 +30,7 @@
#include "version_major.h" #include "version_major.h"
#define LIBSWRESAMPLE_VERSION_MINOR 8 #define LIBSWRESAMPLE_VERSION_MINOR 9
#define LIBSWRESAMPLE_VERSION_MICRO 100 #define LIBSWRESAMPLE_VERSION_MICRO 100
#define LIBSWRESAMPLE_VERSION_INT AV_VERSION_INT(LIBSWRESAMPLE_VERSION_MAJOR, \ #define LIBSWRESAMPLE_VERSION_INT AV_VERSION_INT(LIBSWRESAMPLE_VERSION_MAJOR, \