From patchwork Fri Mar 27 09:55:54 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 18421 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 3472F44AE5A for ; Fri, 27 Mar 2020 11:56:11 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0FEEB68B50F; Fri, 27 Mar 2020 11:56:11 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f65.google.com (mail-wm1-f65.google.com [209.85.128.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5802E68B48E for ; Fri, 27 Mar 2020 11:56:05 +0200 (EET) Received: by mail-wm1-f65.google.com with SMTP id a81so11604004wmf.5 for ; Fri, 27 Mar 2020 02:56:05 -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:mime-version :content-transfer-encoding; bh=iopysB0+vp65l0m0FsAQGfL6tbdLBxBoJi3Erp7vy6k=; b=Qf5h/3aiQhWub5/qfwZ46fF1aJsR8Umbhar7j5FaNZ+1IokHQNyXUXIJ3FYkns0vD5 IwXchEhXnVlV7VPu3cm/2xD5qpP2cUgz4WqyptYR7ICq9CqpmqFBDVILa6RUhuSVnhRp TGOCPErEatFCxGyYR/8OB4ujmhLLNe5BH52vm8lCY//Ervo45++r30BLFcm5zro9Oo4i QlXgEYU87q3NDyA98dNoczx34nfrNELFnLaWhCTe/0IDFAAcf/OejwpJ9LxpD0cgr6sc JF6ADJdJyNmPpcDWgTs0pGXEWbLVSXmuVXjFwlNmVn3jdxQGvaBBw/MJY19AxI0cDiVX Az+Q== 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:mime-version :content-transfer-encoding; bh=iopysB0+vp65l0m0FsAQGfL6tbdLBxBoJi3Erp7vy6k=; b=s4QvRoIWOXKBS40B+hgAImN3FcNsUzVPn77yRJIQCiwIjmCusAwH5BP6es4moGlJhL SBBvI+/DzRmxc4PHrxw/Qj/zRgNWHMwxOfY1BrSEwgtY2V4lSHunDFelk+Yo6uT7UpXw e5XtPgJ3j1BqIrCd+EvxDIkEGmMHjaTilsp/2DAcRGToXEwI2Z7KTYkWuKoRMuueRee6 PFx4AIUiSNjbud+J/beZZheDVtOeqJzM3MJFrAkANHrzcrwP2s1HfzPeAOBX7JZGONLG J+bULLO8I+M1srSOfB89iPlBUHF9nxfZPy17Ftmapfn6nCDKK29eukkslBakVMXdDWOt Y3Rg== X-Gm-Message-State: ANhLgQ0qqmDtkjiHW53YmCWxLTVSacgDjIHHihrjbKETBebK7zzTT7cc gFAwrZxArKLdTmv0mhxl0pbZAXIn X-Google-Smtp-Source: ADFU+vvw7vmm6yqTq+ZdVO/K4pZjoPvOwrRfuMtLt+Clykvx+XSmmGlI50mHPh4izttzLC+ZgGhzBg== X-Received: by 2002:a7b:c304:: with SMTP id k4mr4592526wmj.11.1585302964424; Fri, 27 Mar 2020 02:56:04 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1ab57.dynamic.kabel-deutschland.de. [188.193.171.87]) by smtp.gmail.com with ESMTPSA id g2sm7931921wrs.42.2020.03.27.02.56.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Mar 2020 02:56:03 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 27 Mar 2020 10:55:54 +0100 Message-Id: <20200327095557.24069-1-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/4] avformat/avidec: Don't reimplement ff_free_stream() 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" Using ff_free_stream() makes the code more readable, more future-proof (the old code freed AVCodecContexts and AVCodecParameters and its substructures manually, so that there is a chance that there would be a memleak for some time if new substructures were added) and reduces code size. Signed-off-by: Andreas Rheinhardt --- libavformat/avidec.c | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/libavformat/avidec.c b/libavformat/avidec.c index 00c3978b2d..ae343e732a 100644 --- a/libavformat/avidec.c +++ b/libavformat/avidec.c @@ -600,21 +600,8 @@ static int avi_read_header(AVFormatContext *s) goto fail; ast = s->streams[0]->priv_data; - av_freep(&s->streams[0]->codecpar->extradata); - av_freep(&s->streams[0]->codecpar); -#if FF_API_LAVF_AVCTX -FF_DISABLE_DEPRECATION_WARNINGS - av_freep(&s->streams[0]->codec); -FF_ENABLE_DEPRECATION_WARNINGS -#endif - if (s->streams[0]->info) - av_freep(&s->streams[0]->info->duration_error); - av_freep(&s->streams[0]->info); - if (s->streams[0]->internal) - av_freep(&s->streams[0]->internal->avctx); - av_freep(&s->streams[0]->internal); - av_freep(&s->streams[0]); - s->nb_streams = 0; + st->priv_data = NULL; + ff_free_stream(s, st); if (CONFIG_DV_DEMUXER) { avi->dv_demux = avpriv_dv_init_demux(s); if (!avi->dv_demux)