ffmpeg: Replace av_realloc by av_realloc_f when relevant.
authorNicolas George <nicolas.george@normalesup.org>
Wed, 28 Sep 2011 15:16:11 +0000 (17:16 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 28 Sep 2011 16:13:52 +0000 (18:13 +0200)
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>
ffmpeg.c

index 0ebf96d..0ced8f8 100644 (file)
--- 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;