[FFmpeg-cvslog] avformat/wavenc: simplify malloc failure checking
Michael Niedermayer
git at videolan.org
Tue Jun 24 13:59:01 CEST 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Jun 24 13:51:40 2014 +0200| [501158c682ceb7546d71209374dac406a7f43238] | committer: Michael Niedermayer
avformat/wavenc: simplify malloc failure checking
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=501158c682ceb7546d71209374dac406a7f43238
---
libavformat/wavenc.c | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/libavformat/wavenc.c b/libavformat/wavenc.c
index 57d626f..123dd45 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;
More information about the ffmpeg-cvslog
mailing list