[FFmpeg-cvslog] swresample/swresample: Remove array size hint from swr_convert()

Andreas Rheinhardt git at videolan.org
Fri Dec 3 11:36:52 EET 2021


ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt at outlook.com> | Tue Nov 30 12:24:10 2021 +0100| [77a37e0369b4b0adf06ccbda2f95828fb6afb2c3] | committer: Andreas Rheinhardt

swresample/swresample: Remove array size hint from swr_convert()

SWR_CH_MAX is internal only and the arrays are therefore not required
to have that many elements (and they typically don't do it). So remove
this potentially confusing hint.

(Newer versions of GCC emit -Warray-parameter= warnings for this,
because the definition with explicit size differs from the declaration
(which leaves the size unspecified); this is IMO a false-positive,
because definition and declaration didn't conflict, but anyway it is
fixed by this commit.)

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at outlook.com>

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

 libswresample/swresample.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/libswresample/swresample.c b/libswresample/swresample.c
index 22c2c33673..c03fe5528f 100644
--- a/libswresample/swresample.c
+++ b/libswresample/swresample.c
@@ -711,8 +711,10 @@ int swr_is_initialized(struct SwrContext *s) {
     return !!s->in_buffer.ch_count;
 }
 
-int attribute_align_arg swr_convert(struct SwrContext *s, uint8_t *out_arg[SWR_CH_MAX], int out_count,
-                                                    const uint8_t *in_arg [SWR_CH_MAX], int  in_count){
+int attribute_align_arg swr_convert(struct SwrContext *s,
+                                          uint8_t **out_arg, int out_count,
+                                    const uint8_t **in_arg,  int in_count)
+{
     AudioData * in= &s->in;
     AudioData *out= &s->out;
     int av_unused max_output;



More information about the ffmpeg-cvslog mailing list