From patchwork Sun Jan 26 10:27:37 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 17556 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 40D8C44B846 for ; Sun, 26 Jan 2020 12:28:15 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2D09568B02E; Sun, 26 Jan 2020 12:28:15 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com [209.85.128.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8C65768AF8D for ; Sun, 26 Jan 2020 12:28:07 +0200 (EET) Received: by mail-wm1-f67.google.com with SMTP id t23so3791679wmi.1 for ; Sun, 26 Jan 2020 02:28:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=3DeslVUXhp55cTGlFgfCvWl40jRtglc+MD/6/CE7Cww=; b=QwHAxVmTyuOa3gQN34ALgA/lGYX+zCIerEyQYId7sN9ewjTJ4gS+Kk+nF29BYcmvnm ZVMkNMT9lhDJc3X4YYHnglRPCliifexLAW5TiU4JBmjLyg0EKZlhaE4zPIlJQU7Euyhg pPRDZ9KF09fYHgg2tFxApSEzKiEQx/lkWnRI68hQa/2IO2ONN4abnr7KZzKJRth8R/AA 4Fy3C22dUxqs93EZkD8vecEy9bxzAV/j9EbObUQ8S0FI5mjdapawjejcbKHs8y50SLIE 6SI4X0P08ihfnby9eRdWmvGs29xzQheKLybkOmBbCCY+Xl7kMSOiEvut8vxogkF3yKEq tGGA== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=3DeslVUXhp55cTGlFgfCvWl40jRtglc+MD/6/CE7Cww=; b=gLzY/u2zJ/8Q+a1tjSFgqf6oowrmM/Bh738q5kvrsfd+UbcCA2RdIp+MQSXRkKYAFh uPvRmo6WIqAcGV1v9JL9dCkrnOVVkO6rUPfDIBpVEunJ1/Wo/C+rFV1KbWAerjjcxJ3P YQonlD+6t7iBWn3MDrvtq9Bqu2+GxrERAe2Hwv9K5Q0agsxCbvTOJ15Irf57ybrMf3Kx EpVan1uH5mKFE9wG3Xhtot0NpUpg/3ISgUihiFWUwSI2lyb6SP/FwEBtr4ri/b+CfIuR OVsEtvalifZPn5hl3aiMqGri5bIJcrE5/4rTBXe/NTUioIxQyQSR4MDPbFHBJhjq/TkN bcUw== X-Gm-Message-State: APjAAAXQoHziRH4RHw8Juuda4rB7wNRz4orHqZf62bvY6QvRZmNRS87P HRJNeTiGmLXEWCbDuua0bV8dBEz1 X-Google-Smtp-Source: APXvYqyLsoYKIyUXJrlVht8Q8IrHCNk0+v4UunwwnOF8OdWTqw0lQkRXESk5nnml3VzcxuELRvl0dw== X-Received: by 2002:a05:600c:21c5:: with SMTP id x5mr7717378wmj.72.1580034485895; Sun, 26 Jan 2020 02:28:05 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc08bbf.dynamic.kabel-deutschland.de. [188.192.139.191]) by smtp.gmail.com with ESMTPSA id p5sm15182640wrt.79.2020.01.26.02.28.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 26 Jan 2020 02:28:05 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 26 Jan 2020 11:27:37 +0100 Message-Id: <20200126102739.26495-2-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200126102739.26495-1-andreas.rheinhardt@gmail.com> References: <20200126102739.26495-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/4] avformat/mxfenc: Don't free priv_data of AVStream 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" It will be freed when the AVStream is freed later anyway. Signed-off-by: Andreas Rheinhardt --- libavformat/mxfenc.c | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/libavformat/mxfenc.c b/libavformat/mxfenc.c index 374a83d069..bd3b8bb2d0 100644 --- a/libavformat/mxfenc.c +++ b/libavformat/mxfenc.c @@ -554,16 +554,6 @@ static void mxf_write_metadata_key(AVIOContext *pb, unsigned int value) avio_wb24(pb, value); } -static void mxf_free(AVFormatContext *s) -{ - int i; - - for (i = 0; i < s->nb_streams; i++) { - AVStream *st = s->streams[i]; - av_freep(&st->priv_data); - } -} - static const MXFCodecUL *mxf_get_data_definition_ul(int type) { const MXFCodecUL *uls = ff_mxf_data_definition_uls; @@ -3029,8 +3019,6 @@ end: av_freep(&mxf->timecode_track->priv_data); av_freep(&mxf->timecode_track); - mxf_free(s); - return err < 0 ? err : 0; }