From patchwork Wed Apr 13 14:49:52 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 35304 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:671c:b0:7c:62c8:b2d1 with SMTP id q28csp244721pzh; Wed, 13 Apr 2022 07:50:31 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxPbKIT43nXv8DVOV9h3M1vBUNn1+dhOHl2Tl7AuJKdavob1WPQZX3IBB2s8ESwsdgsEehs X-Received: by 2002:a50:cc8d:0:b0:41c:b4f4:c874 with SMTP id q13-20020a50cc8d000000b0041cb4f4c874mr44371155edi.92.1649861431611; Wed, 13 Apr 2022 07:50:31 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id f21-20020a056402329500b0041d60ede36csi1970501eda.24.2022.04.13.07.50.31; Wed, 13 Apr 2022 07:50:31 -0700 (PDT) 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=hwqgcurV; 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 9BD6868B425; Wed, 13 Apr 2022 17:50:19 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-HE1-obe.outbound.protection.outlook.com (mail-oln040092068061.outbound.protection.outlook.com [40.92.68.61]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 054AD68B3AD for ; Wed, 13 Apr 2022 17:50:13 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=aRXc/iHpozTgTD2ser/S6wbnmXZi4AjaK7QvNrA0mIttqqAOXMyueMQCbO72n/IcTmYSymyKIBsRyoLiXfor8gmNdXV+JaAIiqzWuRcFZx7NGoLkkMJMeEU8Vy9+c87GBM/zYr/sra/JgA3kgHrQizRmsDk+PI0M7GgfXMa/P9RtrCqo1yHb3bhrvzgwwqExBVzjS2Hfw5m0SGPM5cmOWk7Zc0m0RQbhiNa2/ZQEnBQsE8qXI6CSBCeTLDY9XlZG5qmjOVY1BbBrgSkQnznNoh+i/bTT9nUnoE0pKoFPlH64CrmpLf9wRJCqAHjpfJ3rCdT18bn13QjTLokkVawLdw== 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=uV6cewTBMWtJVUMw3J7aOZhHB/vmWMz5JRviKMF+KGA=; b=Ws6cKL7ILM57OX+XQyWWhgCpLtlHcIWBxh8wkSVHyp2BwjfGNkXy/serityA8drgXLFAFidDUCTHji1yutP2cjvzvsmBF6uHvv72XSOOCbHaKgizpw+iK4jvZtaRgpWqj6PyJN4TiFEqxGj6nK4896uyeVFH132zt2MPxGmJDYS0l+KzZCGEfsZIl+URlf4fmiaSMlSnMTGfjcjnOaFkpUBAxvvh2Cg3zb9dHhq+UC9ekiFeA90iaOt4QkAEwS5ivhV5QHdaTnHd//cMj5n+kqvfJLKQgmZN4++9h32L8rarq9z9jBJnSZUpItCiB5I8Yd8mV9aR9UQJXk1T0Z1JPQ== 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=uV6cewTBMWtJVUMw3J7aOZhHB/vmWMz5JRviKMF+KGA=; b=hwqgcurV9cmMOStZD/oAdQoubXfmfrGG3WDaaJbv4l2rEu3jkytv6x6mXNYmiyaS0K48+tXOLPavGnJZV5PqludWlHMGbU0AVLjl7oGrSG19LLiXOMtbz0Mh5SYJv2xh+wfhbX0zgILdFbwywyGBmmp8iMYDM0s+06pIpuoC5gxqMIWLVJaWaSSlfT9P38lpbQXQEHZxQ2K8F4fzp0ZxdCLHCqWAu7xmWQXW6RhGrAan/JivsjDMbykm1nQGjvp52kf2P3441pOanNjd8GoqOY/UgL1qyn/wUrUzXrNrsFw3yj62VUXJfGNnnSIkA84p/T0795WmiaVgYwr4cXwPVQ== Received: from AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) by VI1PR01MB5391.eurprd01.prod.exchangelabs.com (2603:10a6:803:d5::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5144.29; Wed, 13 Apr 2022 14:50:11 +0000 Received: from AS8PR01MB7944.eurprd01.prod.exchangelabs.com ([fe80::fcc3:1285:374c:9b2]) by AS8PR01MB7944.eurprd01.prod.exchangelabs.com ([fe80::fcc3:1285:374c:9b2%5]) with mapi id 15.20.5164.020; Wed, 13 Apr 2022 14:50:11 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 13 Apr 2022 16:49:52 +0200 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [3VZYdGjCc0yy5Fy67LosI0R8Thg2NLCA] X-ClientProxiedBy: ZR0P278CA0073.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:22::6) To AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) X-Microsoft-Original-Message-ID: <20220413144952.968854-3-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 3b696d26-b60e-4352-9de6-08da1d5ce92c X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiT4UWeoLbFMtTy/GVUaPQTcJS4JAFXyMIBxNUKNnNfQJviNj9VO9Cm/Eb9FFPB8Aom6rO7TBDqZ9dptLBpfB3T8PN+SFZENFsJnnTWVpLRTaSc5oeiBgbtFTYc8cs4zOI7LUl8qq1MGUtgfTEn0i7UOJTYMs+Buk0Ig6S1aCvd1hwVcyTTZJqzVUbaE47szmsXJrBybULhIA6mIfO+aKsXqjw3IZqIpx3yg3D8JiFqNPMUPqlFl9JE9ullUI0z/T4jj8uufz0ktcC+7qMEdp/10uE9qWNAAyydKbySG1ZnZynE61m0gVTQwWUHjCOjFCRdER07ueRCE0mRGbvlUh5sYPINfRl6KKFeuf4xKPSLdijQZaC14pPMrD+YDwIN/1yQnGFXBl5Xgsb9ulrfiNHcSNqez62N480x24HAErMq2u/Bf6Vv2U/gjTG4SRUUFc8SLqTa7hx3fPylk0K7qM4AQTVcvKoc9AQn319jch81WwST3WD+V3y295Wep9zGf2aOUNNi9VBCK6y1wAv0c3plu8TtfpZEFSFGAQAtP+LMxn3c9VgRZ2yzz9iqssav6UMNOQh8CtwpDnw3o2fX9TXmaEaOs00/ECg0zYx41rJ93f535nfTKYFVZNe68UI3ybbRZbJC/FzDOMysg5EA32Bu3AGm0xyOL7O5iHUC/W53wJD/z2chT4ex6jYuBzBV8NKnLmj7wlNyr3jes2Y1pfR1vJ7Y3+mODGr6k1LC8xYqPeQO6cZaDPj1Ixe4afwoS6l8= X-MS-TrafficTypeDiagnostic: VI1PR01MB5391:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: uIOsqjpPu+Tr/o/spS8yF8whMqJbeLGl2wyjFvZUkajB7pK4fhJZbHa+ysUtklt7SdXArMwef28HTw+cR5MgRAzXRFMI20PtSISM5Ez//UaCQuE0XN1HeGOaIedRS4uXf0kNN3qKUbcruygXWFqGPyimJli6OjLt+knzf4wS4R2EEbcLfYoWTsSWERNgKewfQ+1YWWeA0ZGg37OKxX44G6UNR2UuCcRoF40qTjVHZg4csGeY67krQcthovB9NbzAnAaPlvdnUf4PWtJF7rkRfG3w5dTxTJgySq5iCU5xpDKBYhEge+9vKw42jJRvffqEMVnzSnUbMEcbzS4La6+oIq1Yzasqm/hujnTtu1ZuffQZg+hAydlWKGfK3uvVbJWNiMdGrs2MV/LMQ0fcmf5kaTgEgBoXxeH96qDA4vsxFsvV8gLCu174/0L5LQ3CiMGWuZldl+59IFzKFfyMKS1VhNU0AgJAw4tKN/hNyHW8euCROcCVLmYtpKoNhtITHtc9tg5DJNSq2LMnaTyDzu5nZmTjiSUCyB1wEzXY+heH3Ifr12dV3ZhTXf6ZJYlcDltFY73/h+fX9YzkaD8QDp2OHg== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: IRhfUvff4dnB+4ZcvG+AZG9pcbmVMHPFoduZ833HQyNEQgCDjgwZi1YgQcUWBRUGd/1zle0/oyb/Wmb7MoYt5uRmIEP8JtbuPka8Ct1codLeNZuYfqnszPPtW/nZOoqR6AtkZocRmE5gCX1S9jrsgFfzElwOC/XBK4etpFF8SUMM+X1Nnim5bLpzcBGQQeKDDEdl3JNKqyzX8OUeVwUKiKxiszvrJHSFEZ35eG4Lha4Sw6TmKhYT2rOcPKa1DHhvUa2cdg1H8FQxSBuTuml+n/wJ60m4szKoyTwIz4uKu0TRMquS8kdgG1Vt59B84z6hGdN3YVi1DdrsZe4GMmbo5li3DFN/jtbCelwyPjVy9bf4hlW9UVf4wN4Kk0cUoCmPuj3bSb9pgrRI1pcHquCLJO+b9j/BQAXtYo80C/JQPl0V88S5iFDohW2hP26FCYpPkq5YVlwcAYYHXrI296tabjN8b4Ud0NnzeHOqZ9BxnksAwXcaGXAb2dF1UkS2p//1hC3fDCQlNSouFmdu/WTcRD76mBljJUKW3VFDpzY3NKF7C2SeOHD0SBP12vmDwGOWvZjtYKE2kT7N6JOdxJtS9zraBg+mmii18COoYf0n+nq7OjEzoxrkCqrF7KjBaa43LKKX3Z87jRjWccubnj2GzHuAxkZEFTJWo6P1jDfwevTBFYc9fMJlk3SVd1yPD7E8XW7lOF8SPvmpXhw+OWyFjKSBbPUl+0Bq2gxuBLngOE93DQnZGha6kSq+S4Hqg5iHt/QqcvVPsuVFJ34RG4j5bvWBon8OHdqOfG809bkdYP8eUNIwwQBk4Za9CuAVGzjXLREg1raU6rGWAG4c6tgVCtt7FMHU46wwaL8qwR3v/rAshJgxaPV0h/IfLv20yKXQf5V9175joKlTljyK7xclPjF67wjaICD7LYQoUJZw5EUJcJ2ERTLARD+7Z3cMqmFXQbfUgKeF16lu7Il/+CXnRXj3rliiIyhqLiyIcMZ9YNMJ0jk1yT9P23zW6aAicJ8RGaEtwHSFqwIj/+EJPHdHcQsK4kc7tqSWrLXV7NyHha7nOhlMEhvkDNu0ez9dv1NCJIVBdKb1e0oCRAGylexu5eY1wexc4oocUh/PAwpMe8aFziMHbs5swxZJyUikrj+j54rtddn6BhlwGeaxEO5Sh9SVy3fNRGSF5SwSTLnslorcUtH+CLzDe9uGDeQKCf80rfb8GgSf++RHD9DfEm35gcV3X/G82MwrS+9LaGz5bDV0KLyBExcd5EEZ0UpN4oDQkQJbQV45B7YgtgJqo/UQN87HB4xV5kA725j4RX3xux+oTPi/fdVEX+GjFj7TvkqfxBfIrdppm6jo7lm+91uq1XiKqFDN39j+U+o4FzgqDA/25irs92gmzztS/0DaS0+rg0ycUG50cV82fk8ENhc+bE2lNLGz/HcjH9UGeKunuEjQfqOuRrxw+YxhLUZyUmnJ X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3b696d26-b60e-4352-9de6-08da1d5ce92c X-MS-Exchange-CrossTenant-AuthSource: AS8PR01MB7944.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Apr 2022 14:50:11.5058 (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: VI1PR01MB5391 Subject: [FFmpeg-devel] [PATCH 4/4] avcodec/avcodec: Simplify accessing AVSubtitleRect via dedicated pointer 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: +1ygtiTvghF5 Signed-off-by: Andreas Rheinhardt --- libavcodec/avcodec.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/libavcodec/avcodec.c b/libavcodec/avcodec.c index 0d971a61d4..d11f035481 100644 --- a/libavcodec/avcodec.c +++ b/libavcodec/avcodec.c @@ -452,12 +452,15 @@ void avsubtitle_free(AVSubtitle *sub) int i; for (i = 0; i < sub->num_rects; i++) { - av_freep(&sub->rects[i]->data[0]); - av_freep(&sub->rects[i]->data[1]); - av_freep(&sub->rects[i]->data[2]); - av_freep(&sub->rects[i]->data[3]); - av_freep(&sub->rects[i]->text); - av_freep(&sub->rects[i]->ass); + AVSubtitleRect *const rect = sub->rects[i]; + + av_freep(&rect->data[0]); + av_freep(&rect->data[1]); + av_freep(&rect->data[2]); + av_freep(&rect->data[3]); + av_freep(&rect->text); + av_freep(&rect->ass); + av_freep(&sub->rects[i]); }