Browse Source

libswresample/audioconvert: Fix undefined NULL + 0

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

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
(cherry picked from commit 64977ed7ae)
tags/n4.4
Andreas Rheinhardt Andreas Rheinhardt 4 years ago
parent
commit
67e401e3cb
1 changed files with 2 additions and 2 deletions
  1. +2
    -2
      libswresample/audioconvert.c

+ 2
- 2
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 ich= ctx->ch_map ? ctx->ch_map[ch] : ch;
const int is= ich < 0 ? 0 : (in->planar ? 1 : in->ch_count) * in->bps; 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]; 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) if(!po)
continue; continue;
end = po + os * len;
ctx->conv_f(po+off*os, pi+off*is, is, os, end); ctx->conv_f(po+off*os, pi+off*is, is, os, end);
} }
return 0; return 0;


Loading…
Cancel
Save