summaryrefslogtreecommitdiff
path: root/libavformat/wavenc.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-06-24 13:51:40 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-06-24 13:51:40 +0200
commit501158c682ceb7546d71209374dac406a7f43238 (patch)
tree1efc7a2e9a013558d91d8540319f022fe6ca2234 /libavformat/wavenc.c
parent3bd0221bc1a0b22b190d08758d128eb18c765aaf (diff)
avformat/wavenc: simplify malloc failure checking
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/wavenc.c')
-rw-r--r--libavformat/wavenc.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/libavformat/wavenc.c b/libavformat/wavenc.c
index 57d626fa2f..123dd459ae 100644
--- a/libavformat/wavenc.c
+++ b/libavformat/wavenc.c
@@ -174,14 +174,9 @@ static av_cold int peak_init_writer(AVFormatContext *s)
}
wav->peak_maxpos = av_mallocz(enc->channels * sizeof(*wav->peak_maxpos));
- if (!wav->peak_maxpos)
- goto nomem;
wav->peak_maxneg = av_mallocz(enc->channels * sizeof(*wav->peak_maxneg));
- if (!wav->peak_maxneg)
- goto nomem;
-
wav->peak_output = av_malloc(PEAK_BUFFER_SIZE);
- if (!wav->peak_output)
+ if (!wav->peak_maxpos || !wav->peak_maxneg || !wav->peak_output)
goto nomem;
wav->peak_outbuf_size = PEAK_BUFFER_SIZE;