[FFmpeg-cvslog] ffmpeg: Replace av_realloc by av_realloc_f when relevant.

Nicolas George git at videolan.org
Wed Sep 28 18:17:16 CEST 2011


ffmpeg | branch: master | Nicolas George <nicolas.george at normalesup.org> | Wed Sep 28 17:16:11 2011 +0200| [1d3b280e7116993d64cf444957d6dfb00b2a9627] | committer: Michael Niedermayer

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 at normalesup.org>
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1d3b280e7116993d64cf444957d6dfb00b2a9627
---

 ffmpeg.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/ffmpeg.c b/ffmpeg.c
index 0ebf96d..0ced8f8 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;



More information about the ffmpeg-cvslog mailing list