virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-03-08 22:39:44 +02:00
Code Issues Releases Activity

libswresample/audioconvert: Fix undefined NULL + 0

Browse Source 
Affected 26 FATE tests like swr-resample_async-s16p-44100-8000.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
(cherry picked from commit 64977ed7ae1e437910ca837ccb282e07d9200249)
This commit is contained in:
Andreas Rheinhardt 2021-03-26 09:43:22 +01:00 committed by Andreas Rheinhardt
parent 789dadccc0
commit 67e401e3cb
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libswresample/audioconvert.c
View File

@ -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;