summaryrefslogtreecommitdiff
path: root/libswresample/swresample.c
diff options
context:
space:
mode:
authorGanesh Ajjanagadde <gajjanagadde@gmail.com>2015-06-02 23:17:48 -0400
committerMichael Niedermayer <michaelni@gmx.at>2015-06-03 11:46:37 +0200
commit196b885a5f0aa3ca022c1fa99509f47341239784 (patch)
treeef9bca53a6d768bc1771ba77bfacf50fc488ab31 /libswresample/swresample.c
parent7495e728f5a21bb1619789f12227dcdb1baf65ee (diff)
swresample/dither: check memory allocation
check memory allocation in swri_get_dither() Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswresample/swresample.c')
-rw-r--r--libswresample/swresample.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/libswresample/swresample.c b/libswresample/swresample.c
index 3d3ab83fd9..87ad7f8d78 100644
--- a/libswresample/swresample.c
+++ b/libswresample/swresample.c
@@ -627,7 +627,8 @@ static int swr_convert_internal(struct SwrContext *s, AudioData *out, int out_co
return ret;
if(ret)
for(ch=0; ch<s->dither.noise.ch_count; ch++)
- swri_get_dither(s, s->dither.noise.ch[ch], s->dither.noise.count, 12345678913579<<ch, s->dither.noise.fmt);
+ if((ret=swri_get_dither(s, s->dither.noise.ch[ch], s->dither.noise.count, 12345678913579<<ch, s->dither.noise.fmt))<0)
+ return ret;
av_assert0(s->dither.noise.ch_count == preout->ch_count);
if(s->dither.noise_pos + out_count > s->dither.noise.count)