]> git.sesse.net Git - ffmpeg/commitdiff
avformat/wavenc: simplify malloc failure checking
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 24 Jun 2014 11:51:40 +0000 (13:51 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 24 Jun 2014 11:51:40 +0000 (13:51 +0200)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/wavenc.c

index 57d626fa2f2f4896099743221b3cb89294cadc32..123dd459ae43dcf0e24dbdf36ff9cf4a4b44da60 100644 (file)
@@ -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;