ffmpeg | branch: master | James Almer <jamr...@gmail.com> | Mon Jun 7 00:04:21 2021 -0300| [8a6103326e165b30510378cbd0e7953910f2b55c] | committer: James Almer
avutil/samplefmt: don't add offsets to NULL pointers Signed-off-by: James Almer <jamr...@gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8a6103326e165b30510378cbd0e7953910f2b55c --- libavutil/samplefmt.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/libavutil/samplefmt.c b/libavutil/samplefmt.c index fc077f6444..c7428940e1 100644 --- a/libavutil/samplefmt.c +++ b/libavutil/samplefmt.c @@ -160,13 +160,20 @@ int av_samples_fill_arrays(uint8_t **audio_data, int *linesize, if (buf_size < 0) return buf_size; + if (linesize) + *linesize = line_size; + + memset(audio_data, 0, planar + ? sizeof(*audio_data) * nb_channels + : sizeof(*audio_data)); + + if (!buf) + return buf_size; + audio_data[0] = (uint8_t *)buf; for (ch = 1; planar && ch < nb_channels; ch++) audio_data[ch] = audio_data[ch-1] + line_size; - if (linesize) - *linesize = line_size; - return buf_size; } _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog To unsubscribe, visit link above, or email ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
