[FFmpeg-cvslog] avformat/nutenc: Drop redundant frees

Andreas Rheinhardt git at videolan.org
Sat Mar 14 23:11:27 EET 2020


ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt at gmail.com> | Sat Mar 14 17:32:17 2020 +0100| [a4a98f15b29b32e561ac5d8dea0f027da1bde012] | committer: Michael Niedermayer

avformat/nutenc: Drop redundant frees

Should writing the header fail, the allocations already performed will
be freed during deinit so remove the frees in nut_write_header().

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at gmail.com>
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

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

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

diff --git a/libavformat/nutenc.c b/libavformat/nutenc.c
index 44773924dd..1d48625815 100644
--- a/libavformat/nutenc.c
+++ b/libavformat/nutenc.c
@@ -703,12 +703,8 @@ static int nut_write_header(AVFormatContext *s)
     nut->chapter  = av_calloc(s->nb_chapters, sizeof(*nut->chapter));
     nut->time_base= av_calloc(s->nb_streams +
                               s->nb_chapters, sizeof(*nut->time_base));
-    if (!nut->stream || !nut->chapter || !nut->time_base) {
-        av_freep(&nut->stream);
-        av_freep(&nut->chapter);
-        av_freep(&nut->time_base);
+    if (!nut->stream || !nut->chapter || !nut->time_base)
         return AVERROR(ENOMEM);
-    }
 
     for (i = 0; i < s->nb_streams; i++) {
         AVStream *st = s->streams[i];



More information about the ffmpeg-cvslog mailing list