ffmpeg | branch: release/4.4 | Andreas Rheinhardt <[email protected]> | Fri Mar 26 09:43:22 2021 +0100| [67e401e3cb0bf8d3a6f13828d9905be75cf969fd] | committer: Andreas Rheinhardt
libswresample/audioconvert: Fix undefined NULL + 0 Affected 26 FATE tests like swr-resample_async-s16p-44100-8000. Signed-off-by: Andreas Rheinhardt <[email protected]> (cherry picked from commit 64977ed7ae1e437910ca837ccb282e07d9200249) > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=67e401e3cb0bf8d3a6f13828d9905be75cf969fd --- libswresample/audioconvert.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libswresample/audioconvert.c b/libswresample/audioconvert.c index 89ee7bfae3..500aa0e5c5 100644 --- a/libswresample/audioconvert.c +++ b/libswresample/audioconvert.c @@ -237,10 +237,10 @@ int swri_audio_convert(AudioConvert *ctx, AudioData *out, AudioData *in, int len const int ich= ctx->ch_map ? ctx->ch_map[ch] : ch; const int is= ich < 0 ? 0 : (in->planar ? 1 : in->ch_count) * in->bps; const uint8_t *pi= ich < 0 ? ctx->silence : in->ch[ich]; - uint8_t *po= out->ch[ch]; - uint8_t *end= po + os*len; + uint8_t *end, *po = out->ch[ch]; if(!po) continue; + end = po + os * len; ctx->conv_f(po+off*os, pi+off*is, is, os, end); } return 0; _______________________________________________ ffmpeg-cvslog mailing list [email protected] https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog To unsubscribe, visit link above, or email [email protected] with subject "unsubscribe".
