[FFmpeg-cvslog] avformat/utils: Use av_memdup to duplicate array of AVChapter *

Andreas Rheinhardt git at videolan.org
Tue Aug 31 18:43:50 EEST 2021


ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt at outlook.com> | Fri Aug 27 10:15:51 2021 +0200| [fea4f953b5c6e04b84ce9c11664c9cbcac171a60] | committer: Andreas Rheinhardt

avformat/utils: Use av_memdup to duplicate array of AVChapter *

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at outlook.com>

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

 libavformat/utils.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/libavformat/utils.c b/libavformat/utils.c
index b3ff9e95eb..b56190d2da 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -3176,12 +3176,9 @@ static int compute_chapters_end(AVFormatContext *s)
         max_time = s->duration +
                        ((s->start_time == AV_NOPTS_VALUE) ? 0 : s->start_time);
 
-    timetable = av_malloc(s->nb_chapters * sizeof(*timetable));
+    timetable = av_memdup(s->chapters, s->nb_chapters * sizeof(*timetable));
     if (!timetable)
         return AVERROR(ENOMEM);
-
-    for (i = 0; i < s->nb_chapters; i++)
-        timetable[i] = s->chapters[i];
     qsort(timetable, s->nb_chapters, sizeof(*timetable), chapter_start_cmp);
 
     for (i = 0; i < s->nb_chapters; i++)



More information about the ffmpeg-cvslog mailing list