From patchwork Mon Sep 28 11:36:27 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 22643 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 57A6C4492E7 for ; Mon, 28 Sep 2020 14:36:43 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2FA3468B4FA; Mon, 28 Sep 2020 14:36:43 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 322A86897F4 for ; Mon, 28 Sep 2020 14:36:36 +0300 (EEST) Received: by mail-wr1-f66.google.com with SMTP id g4so935878wrs.5 for ; Mon, 28 Sep 2020 04:36:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:reply-to:mime-version :content-transfer-encoding; bh=I54BEPmvPPpZHm9wZovfYNfrypBiGZK8ZajPnAp/LjQ=; b=TlUpAe+DLJAbmVa6tB67l1eHGCvxbt4oexUxAHV9UlbNPZxclNPXz3tf5OdY1HMS+4 MrW1bugO05XjvHflzqCKQKEf4W+YsUGuaiDLg2zh9PjBEGQXs1cJeL8oSq1Q3kiWc7cA qww7vAD/Z0wdoMBc/Njq8U3HbV4KyrlLM7kssp3BhXsz2pvmsGfNj6lPdz7Ny6sco9i/ 4+RNogqH49Y/Y6uZ+4PQN6ImFyslQ7XLLsYHZhez6nY/tzEJZ+/Og4MuAIEdBGONScS3 GE/FsqL7bHMPfx2MjJUdiMBHS3Nkz24b5al6CUCoWdCryJeLR5KkfJB9Y9LSRG3nVUgc MlXw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :mime-version:content-transfer-encoding; bh=I54BEPmvPPpZHm9wZovfYNfrypBiGZK8ZajPnAp/LjQ=; b=NKmkyx66LLPVl8sYCbcrV9VrBCj0wsSfGdvW0L3jaS4dwi6nG5k1DicyeD61GEBYUC YALRRe72QZCpG6MoavU0wSSZ2EO+dtuf8QodEdNL7/FGHQ1Uk43mTtMX2sFt8uaW0SGh zEe/kxYKGqXWkzwj/JeBlug7snGWIsEvizWR+xdw4MQdESe9DFD5jspERQBB0NJZs8hF CQWOzNSGlsQ0+vn/i6k80N1DUQBE3Let3wc3qLRn7t3YX3c5hLi2YF0BwXIkrvDkSkx8 yb79rjxW26h15JjNpvLMbiepizH/JuCk8x3pgvAwDTiSUw8dp3NQ10MJej5s2TtKQeaa WStw== X-Gm-Message-State: AOAM533efQlZtO4ZgkSLWKPzP5vudQGo5stF1huMpYTeZC+heW0B293P pnJB8VECWX1n5WGJS65TTWmH1VoSbOM= X-Google-Smtp-Source: ABdhPJwqDD+lZ8jxom8HMOtEIY2UOyDo8isSpB6Wu72XXUEOe8yLHnnKQdGxklGRdGRWwnie4T1Q3w== X-Received: by 2002:adf:fa52:: with SMTP id y18mr1267863wrr.264.1601292994966; Mon, 28 Sep 2020 04:36:34 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id d6sm1232949wrq.67.2020.09.28.04.36.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Sep 2020 04:36:34 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 28 Sep 2020 13:36:27 +0200 Message-Id: <20200928113627.498818-1-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2] avformat/movenc: Don't free AVCodecParameters manually X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Andreas Rheinhardt --- Sorry, I missed that my tree is dirty before sending the last patch. libavformat/movenc.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 20768cd45f..63adae5e0a 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -6255,9 +6255,7 @@ static void mov_free(AVFormatContext *s) int i; if (mov->chapter_track) { - if (mov->tracks[mov->chapter_track].par) - av_freep(&mov->tracks[mov->chapter_track].par->extradata); - av_freep(&mov->tracks[mov->chapter_track].par); + avcodec_parameters_free(&mov->tracks[mov->chapter_track].par); } for (i = 0; i < mov->nb_streams; i++) {