aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLukasz Marek <lukasz.m.luki2@gmail.com>2014-05-11 05:33:56 +0200
committerLukasz Marek <lukasz.m.luki2@gmail.com>2014-05-20 00:00:45 +0200
commit2ed9e17ed1793b3b66ed27c0a113676a46eb9871 (patch)
treeb0fa0f6151be5f2baf7b5332fff651d36761ec8d
parentc61cdefa4d795b4484bc8e2280aa570c00833336 (diff)
downloadandroid_external_ffmpeg-2ed9e17ed1793b3b66ed27c0a113676a46eb9871.tar.gz
android_external_ffmpeg-2ed9e17ed1793b3b66ed27c0a113676a46eb9871.tar.bz2
android_external_ffmpeg-2ed9e17ed1793b3b66ed27c0a113676a46eb9871.zip
lavf/audiointerleave: check for allocation failure
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
-rw-r--r--libavformat/audiointerleave.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/libavformat/audiointerleave.c b/libavformat/audiointerleave.c
index 1243f43c18..97bd801aa7 100644
--- a/libavformat/audiointerleave.c
+++ b/libavformat/audiointerleave.c
@@ -67,7 +67,8 @@ int ff_audio_interleave_init(AVFormatContext *s,
aic->time_base = time_base;
aic->fifo_size = 100* *aic->samples;
- aic->fifo= av_fifo_alloc_array(100, *aic->samples);
+ if (!(aic->fifo= av_fifo_alloc_array(100, *aic->samples)))
+ return AVERROR(ENOMEM);
}
}