aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-02-17 21:00:04 +0100
committerMichael Niedermayer <michaelni@gmx.at>2015-02-17 21:00:04 +0100
commit15cd2a93e7f64b5b4e4367014a78ee8f9e63c2bb (patch)
tree4fd2849df326b20ef08fd8824e98becf05752670
parent9d5017a20c26b98bdd6fec29f3eaa465a779e24c (diff)
parent81688e68f93f3142e2093f1a3d226edaeb179992 (diff)
downloadffmpeg-15cd2a93e7f64b5b4e4367014a78ee8f9e63c2bb.tar.gz
Merge commit '81688e68f93f3142e2093f1a3d226edaeb179992'
* commit '81688e68f93f3142e2093f1a3d226edaeb179992': avconv: Check rc_override memory allocation Conflicts: ffmpeg_opt.c See: 7efabffc2899b76688a40b4bd7c63370eb2d8ca8 Merged-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--ffmpeg_opt.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/ffmpeg_opt.c b/ffmpeg_opt.c
index f208ac567d..dba59a9bdb 100644
--- a/ffmpeg_opt.c
+++ b/ffmpeg_opt.c
@@ -1393,8 +1393,10 @@ static OutputStream *new_video_stream(OptionsContext *o, AVFormatContext *oc, in
video_enc->rc_override =
av_realloc_array(video_enc->rc_override,
i + 1, sizeof(RcOverride));
- if (!video_enc->rc_override)
+ if (!video_enc->rc_override) {
+ av_log(NULL, AV_LOG_FATAL, "Could not (re)allocate memory for rc_override.\n");
exit_program(1);
+ }
video_enc->rc_override[i].start_frame = start;
video_enc->rc_override[i].end_frame = end;
if (q > 0) {