aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolas George <nicolas.george@normalesup.org>2011-09-28 17:16:11 +0200
committerMichael Niedermayer <michaelni@gmx.at>2011-09-28 18:13:52 +0200
commit1d3b280e7116993d64cf444957d6dfb00b2a9627 (patch)
treec89b2a0411fd646835db84c77ec88a2f4555256e
parent5cd754bca290775ec2dbbf88597ab58e0482efca (diff)
downloadffmpeg-1d3b280e7116993d64cf444957d6dfb00b2a9627.tar.gz
ffmpeg: Replace av_realloc by av_realloc_f when relevant.
Also mark with a visible comment "FIXME realloc failure" places where av_realloc seems to lack a proper test for failure. Signed-off-by: Nicolas George <nicolas.george@normalesup.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--ffmpeg.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/ffmpeg.c b/ffmpeg.c
index 0ebf96dcb5..0ced8f8e0b 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -3303,6 +3303,7 @@ static OutputStream *new_video_stream(OptionsContext *o, AVFormatContext *oc)
av_log(NULL, AV_LOG_FATAL, "error parsing rc_override\n");
exit_program(1);
}
+ /* FIXME realloc failure */
video_enc->rc_override=
av_realloc(video_enc->rc_override,
sizeof(RcOverride)*(i+1));
@@ -3474,7 +3475,7 @@ static int copy_chapters(InputFile *ifile, OutputFile *ofile, int copy_metadata)
av_dict_copy(&out_ch->metadata, in_ch->metadata, 0);
os->nb_chapters++;
- os->chapters = av_realloc(os->chapters, sizeof(AVChapter)*os->nb_chapters);
+ os->chapters = av_realloc_f(os->chapters, os->nb_chapters, sizeof(AVChapter));
if (!os->chapters)
return AVERROR(ENOMEM);
os->chapters[os->nb_chapters - 1] = out_ch;