aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2009-12-08 14:50:46 +0000
committerMichael Niedermayer <michaelni@gmx.at>2009-12-08 14:50:46 +0000
commite185a2f649d970bd333f2c82ff1716ffd54e04ba (patch)
treeb701d2159241d95a5e15a61c14a92f048725f5ae
parentb8919a30923d4be9033b925b509e54b0ef6ad98c (diff)
downloadffmpeg-e185a2f649d970bd333f2c82ff1716ffd54e04ba.tar.gz
Do as the comment says and signal an error.
Originally committed as revision 20770 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--ffmpeg.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/ffmpeg.c b/ffmpeg.c
index 01b51e817b..d1a00b81d0 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -583,8 +583,10 @@ static void do_audio_out(AVFormatContext *s,
av_fast_malloc(&audio_buf, &allocated_audio_buf_size, audio_buf_size);
av_fast_malloc(&audio_out, &allocated_audio_out_size, audio_out_size);
- if (!audio_buf || !audio_out)
- return; /* Should signal an error ! */
+ if (!audio_buf || !audio_out){
+ fprintf(stderr, "Out of memory in do_audio_out\n");
+ av_exit(1);
+ }
if (enc->channels != dec->channels)
ost->audio_resample = 1;