From patchwork Sat Mar 2 15:43:27 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 46703 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:a919:b0:19e:cdac:8cce with SMTP id cd25csp1907065pzb; Sat, 2 Mar 2024 07:42:05 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCXQb9DdLGb0CopTVgNrJG4sLADCFFnDA54MNKjEQueZaO+EoqMzS/RAAAQsHZkb3SBpTm1hDURZ97yKzP6Z+b+dJq+V0cowdSIqnQ== X-Google-Smtp-Source: AGHT+IFO40IlQCQo+BBoZ3ZBbvk4uIfydo8viCT/8dEKWnqFqh2Gf+gEr1BZ7XXg2FsOMkXsxb2r X-Received: by 2002:a17:906:714f:b0:a43:3b2:bcf6 with SMTP id z15-20020a170906714f00b00a4303b2bcf6mr3248773ejj.14.1709394125325; Sat, 02 Mar 2024 07:42:05 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id uz6-20020a170907118600b00a44eb0cd72bsi387987ejb.430.2024.03.02.07.42.04; Sat, 02 Mar 2024 07:42:05 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@outlook.com header.s=selector1 header.b=qaVrJuU4; arc=fail (body hash mismatch); spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id BC7B968D2F7; Sat, 2 Mar 2024 17:42:00 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2071.outbound.protection.outlook.com [40.92.91.71]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6C9B868C830 for ; Sat, 2 Mar 2024 17:41:52 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=XjHOKssIG3b4stcB2FseG/NgLHC2Pe3iPocwCQudWeKkYiKVACBcWjeHCmipjr1Mo0ElW511bn/LGGti3vuCQ5KWqpy0HHP9YQv3ODUyCo6aOMIEmBgY0z64QRSXbDyjqfhn0eAJ50djy4ApUv9Ib3mUGJvOR5tWy2t0oh5vqvayObmIHHzn09jweTOxVsG5mRgWyNf/752PAfOq4PpRHBbzDDPbBBM72pzYoHgAGKugBBgP6Dy5WrUvchvy0XIpxtCjEjPrIsRS9dZT+0hWehh1r8X68u0RL6JX6C1YPk3d6Pjandgsx+aSpL8EySkkkB0l1M4ZoPKlRU8iT6bVcw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=A3jjvctHVtZpnYWn2h4DjLN7vj7GJy2FVmeTEvabEc8=; b=k087CohHKSJ4zIenpu0dc6LtTW9Qg+uRjwlxTnfW/YuVWIt1XJyppc7yV0vBv1K7zhUsnnLBIbtjS/GYGhRB2pxgx2il7h6sapysQQWFYjFGy4dpO7mfCmOjY8NDyAqInQLXaO3+Ii+Z3hTa7gZhZWVy2tPopEjKkYSNYJVWSc5R+GNIYXC11/02Sto2vjh3OUI+waRGeyUCYvcX3p1boEfE1oRhCmDP3dRMNr+GynDm54DNmFySnQm1qfoB2PPJb7lyUWZKkNi6cldpQfnQuV31O5W9Yk8i3UpRULXxpHoopN+6t66G8BwAmiyyPDjKRvtHy9F3+iWY9gptp80F7Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=A3jjvctHVtZpnYWn2h4DjLN7vj7GJy2FVmeTEvabEc8=; b=qaVrJuU4kr+gorMcQktcSPJLxiHlU2uiUaYP2njrZG/PZCYzLqAM63OmfrL2II6lSJbxSco01XbNQbVBCXb/JnqAM8I0gRwDz49bOT6oPZFNqMIlXX97RIy/KN8mNQnSBEedDfaEO8QsGyR6aISEsub7j+yqZecvk9pmsSSqXS5acn6fke4rPxOx4zO5G5NvlllPOI5IL4BqG8uP433fZ78Q/NlaIuMb8iTBWaUymxl5k3SyZdQJUg2WjzEPNq1WZDT5Zus5J7zc45qsfinx06fI2F0UMgr2g1bH+SRdp5vSVD4pKqmJhGshWaY4OYs7CH56wI2X9gP0P1ydlsxyqA== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by AM8P250MB0293.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:328::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7339.34; Sat, 2 Mar 2024 15:41:46 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::65aa:deb0:a18e:d48d]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::65aa:deb0:a18e:d48d%5]) with mapi id 15.20.7316.023; Sat, 2 Mar 2024 15:41:46 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 2 Mar 2024 16:43:27 +0100 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [ljcGyjxLS7v6tzwwGMeTLa6xB685W9XliKY5hbbVS3g=] X-ClientProxiedBy: FR5P281CA0001.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:f2::15) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20240302154327.4047954-3-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|AM8P250MB0293:EE_ X-MS-Office365-Filtering-Correlation-Id: a7571657-9902-4cef-32fb-08dc3acf44cf X-MS-Exchange-SLBlob-MailProps: Cq7lScuPrnp1Zl+T4aq3XJ6trwEamTGXa8AXBhJ7FI3j4Y9Li265d5CQkSz5CCTlAqBTR32u9rmTp49Bybt3a8sxesEoJZrWMi8JNLXiF7YRelgAgIHkVCfHHxwWX8cBJm33aRMslLkp0or8PsrRAo8ZeCGl/glVRHLjHDHFdXgVAEUMXcG3fTbeXfdYTccCc1P7uzXzFT7pqFiDcDUVLPQJ0svfjViLOnVhTXhMaxGEtRvnL2R8nB3gF14Ziy/Rg9IARVGqVCZXPIVkHs180WYnKy5BfNERMVZRB3pmK+VNnJfFqG0v+6IDfvPZG73xQXsBk4UakZPrWcC0cvGbGcIZIEFiX8AqSdnOCXfENLTZ6IK2ahXPuBt4QXy7iOznD/gsPmLyWW5EsYKSC02JdktkuEVaBPVlALaMqVjWOOWLkupWGOIX148FARWnJwLhKJjEJffkJ623b4MsnRg4OKKXwWeee292E3U2RAqFlkxTmQdTlbHVu4sluObaKber4DdTuRa+PXROvCqO1yjVscA855jIAa3XAHdd0vu1PGBsjgFTT8tdO46Izip1URGat34kHrW0WpDtob0y+eBgh7lVWD6FXctj3WuPyzfKougx+8VGPPvXjcM8yak19gJ1GIGNKjsa12XfP7a7fAczq1N+zEW1aKMf2Qow6dgJypj+NJi2Cc2cjeM1U+7Qu0ywienHmDxD5ye1S7/hwRkRCTBaGQC+1/ga8jcPmCfgZEmu2UxJ8/RDsx5/hkG8B3snQzUyy2JGuC4= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: osgOM68OSwPHk+MmJTqGfKwec+1wcx51XczmTTtGag2ezajet98puLVn9sD5UFw8bhqtuxFXHykBRAkO/F6945Ky+GfE7Zt9z61VWVu2TsqAelhuP95l8nDe9X2TbfLHkLOhCMerE/9Yv7YlDHxvsMgIO4xoxKugHsQB0gQgWy7a/oUMxFCifzSUy5bmC5sNpGgU5ljfg86X2lFsYtxtTm4DzQ+EWcWJWAfXcI5PR45A+WSpWd8M0un+zPVcbFYq1XXXtA5XmIKl+c/xBJnUgNiPz4UQeYZiLTxX/Ieul5Dfp+1liOvAVp7nESZ8eOz569kPVEU9lT23zJabDD3JnXT+H15fruyBpu1fkqyJFpHg8Yh0Xwa9r3RKVd7R1x+W2OQsymmWUltECB4lnxuByhnquDDXMWl7MUBNB9rx7Of+n7Au83v0tEIr2vZKorP9WPWlo4FduAIV1/9C5KMIoNVfTRcf2E/OZ+wSfD8zazkoy0gUm06rNPYXa0xUMR9CK/TgHYKIsS7J8OK0ArtBGe0+TtDXl6GrPsiPTkbyVVGpE9QFo/IT1abYezFScycqUCN032V6dvlQileJrUSBq1u0kJIP+ngWSd4yNcGBuSn7QFu37FtPG0DV1CzQXR+R X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: pYuH4boj4s7Kobmtwx1Nw3uQlxKYU3WnbjzNVxuyVcLK9Sc6JxutXtd85gKD5aL+c5mgA7BIifP5DtBgIZk5968/OrCRc+DAvk00FPI7iX4G9zwmTHvBk2JJTWPS3N076Y1yN4yFdam/jo5qSjlvhwFXUfRKC2ogNQ7d1wZVS+pEZzEGNWTOvqIN2V9elAgAkcEcI3bF0FLkruu9v/9FoPa6b6Cui9Bpet+msjfmDS2gqkHDaoQueqhujSk4Y8xSJOP0sfE4x2xsi6hGcZRmjM4uSb72C1eY/9q6g7a9UGJPysWNj6wMWzQuaRO4A6L0YZri7Ucg/OIy+Pdru3/xK60QOCtsKz+iWQwbFzHxh03DJmLTPmiHzO1DJo9yLR5t/zb1EuRRuYT8fSM1wkco7K/prD63tMjKIR51SqOBx5wVwvn5aNBt1ulJe1kxMDRD4lCyi7jkRNxTGCWr9eUVD/s98nJBY9iV8uNx6tiPlYM1TQiV8TIW38icl8acdIdst48i+DLNeS2dQ6EG1Dz7i4eNAJpLTkZK9Uj9/r+JHLh6sqlykmDBqn42ZuL648Egj19eP5VsXy+66lsul732OecEd6LawYvh7MyebhR8zC1PrheigciDuc3nHNA4TW7ZLNl7bpT1MV++U9WwXKBK5UZv6va6R7zKNdt9i63Af7jIEGeM33SvEXolh9MoLGZ0ezjIEypCwBSzvVL+c1j5Es7qfvQodervRu4vZ5gO9xoEEH+8DPUOx3NsBJq0fSRfB9dXTbzGEkMTzgkiEbiZiYXMhLuMCmht/lOMWmcUYt+VUdFJ1qg1LSbVwllLJflBm/2iRedbAIO7cQRcOqWUDnFx3Zf0Pldeu1/snTMNpHNx7wdt4EwAgX1b+Eh7rrLh+THpypMiCF4bJuPg0zwq6fEAosnUdY5ssjyxM+bE9xYD7QhEn/S/XU3ptMRR6CVM8X2Em7V3tPgea7hccehg/WULf9sjq0IimTEwz+GIpYIlmq0p+j1I45gRYe+T2lyegRgYg/iIzGXXvB1F46guM2aWDQnZ8NqJtJaS4oxmSVGrdxHtaRiuQUImSu4jodb8hsbUSmjXNTa3CQo8HVGsHFL2KTonN3XY+Ahu+NwPjxOgfFaz75tNsEy2Cw3BAVUyZhMA4MJS0ssy2LuxAwpofZP9qHWRYyU/WFAKNp1FnclGUX9ZZhXbdOfVHAQkJQ2daDgjNdrvNl4bwxMmA3UbXoRtlfXPkJ0Q3U2oGiNcU1Z62gQxMWU3Hi1r7KgRW/emjdRiWBsIJp7cDuOw8XjRyw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: a7571657-9902-4cef-32fb-08dc3acf44cf X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Mar 2024 15:41:46.8262 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM8P250MB0293 Subject: [FFmpeg-devel] [PATCH 4/4] avformat/dvdvideodec: Reorder allocations to simplify freeing X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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" X-TUID: VVAxhCoMWPp1 Signed-off-by: Andreas Rheinhardt --- libavformat/dvdvideodec.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/libavformat/dvdvideodec.c b/libavformat/dvdvideodec.c index f2f23affb2..7f4ecf2b61 100644 --- a/libavformat/dvdvideodec.c +++ b/libavformat/dvdvideodec.c @@ -1211,20 +1211,16 @@ static int dvdvideo_subdemux_open(AVFormatContext *s) extern const AVInputFormat ff_mpegps_demuxer; int ret = 0; - if (!(c->mpeg_ctx = avformat_alloc_context())) - return AVERROR(ENOMEM); - - if (!(c->mpeg_buf = av_mallocz(DVDVIDEO_BLOCK_SIZE))) { - avformat_free_context(c->mpeg_ctx); - c->mpeg_ctx = NULL; - + if (!(c->mpeg_buf = av_mallocz(DVDVIDEO_BLOCK_SIZE))) return AVERROR(ENOMEM); - } ffio_init_context(&c->mpeg_pb, c->mpeg_buf, DVDVIDEO_BLOCK_SIZE, 0, s, dvdvideo_subdemux_read_data, NULL, NULL); c->mpeg_pb.pub.seekable = 0; + if (!(c->mpeg_ctx = avformat_alloc_context())) + return AVERROR(ENOMEM); + if ((ret = ff_copy_whiteblacklists(c->mpeg_ctx, s)) < 0) { avformat_free_context(c->mpeg_ctx); c->mpeg_ctx = NULL;