From patchwork Mon Mar 13 13:22:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 40660 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:d046:b0:cd:afd7:272c with SMTP id hv6csp1750364pzb; Mon, 13 Mar 2023 06:21:47 -0700 (PDT) X-Google-Smtp-Source: AK7set/iTJh2yWK9a21KnS4re9i2Y5e6KU4z/9eYdjJ9hrxhMVMi+80cSYkyOstjj+r0BLA6jFLv X-Received: by 2002:a17:907:98cb:b0:91f:b511:4d6 with SMTP id kd11-20020a17090798cb00b0091fb51104d6mr7762645ejc.6.1678713707748; Mon, 13 Mar 2023 06:21:47 -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 mm11-20020a170906cc4b00b008dd2d2adb3fsi7583524ejb.294.2023.03.13.06.21.45; Mon, 13 Mar 2023 06:21:47 -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=VMMiPh2K; 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 85D6168B896; Mon, 13 Mar 2023 15:21:42 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-db3eur04olkn2050.outbound.protection.outlook.com [40.92.74.50]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 21D9368AC74 for ; Mon, 13 Mar 2023 15:21:36 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=jfdDRWCj9aq4zXtnmGYhHAexfgJFD6JVvDhbaoVs1LHDVXeCjfR0/70jt6hqQnOTHun3zmuOIqj4xceU2H3DaTTuk6SA8quMTbaveGIPsqK5v3glm4/+AatzJotczSLG8PeHa/6XZeNhoQBRsawPHFdL9sfdhaKgHSRBMEUb0ChQLy+AN2+Pys0TtoxI/5O3Ug/I059mw0grkn8Y6uhbUp3ibUmVpNdNvSkmIr7ChFb3ciBYzxEPetJrBLC+fmQ2KUrZ4Fgxg5Xlp8lQCJ/OiqkR/GPBGCUjlImAMNjCjel2HOQbd9/oezNTCi81FFH57FKgPSTAnY2JFHE9zMHcdQ== 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=A1xzkgbDzP21rvp6J9uwRNC+ZHMK67vlz/BRlzi/pFU=; b=FCZDI0Dekdl4CYYUVxg9lqZAa12cblBmtmUsryOMGc8eFUYxtAt17e+5UShDX7UctkyKHiT06Mg4yVu+YX9rZEvkgq+YCbaD0mHXzNlTUZVhYo17cIvqazL/eRF3TebxopQjEjQdMjnGSJovWCUgzmoaRZqoELl9Yne/r4iTD7LP85N8cbzpGAvId4mF0VafI//U8ths7edhIUa3IHguEK6/cKn9fzsks5vwkKvMwa2JL3BJ8kGvMxxQ/Y8p4d7MDPsGm0MwKQeYsbmJeO7Ts1RVK7Ot2QR2HwenbHBEloJjGw4BPgzGD6JT2z3LW8iNhOfr3CXYbWr0Dv3xwwTnIw== 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=A1xzkgbDzP21rvp6J9uwRNC+ZHMK67vlz/BRlzi/pFU=; b=VMMiPh2KeUDaxui/rvzpHsrmU2oaseimUvfVWoCW/nct6DTnoGy2brgVLWjZmsTmPWMunudBDL9Tys2q1qkGd1EjPv+Ym5+tfVwbOC7K/E42eN2TBikvNORByKl8hz1qVzqFkeslFG/CbEVxePEbICI1AO8Y78HnUICOGZ1K3t2TT8dPuLxw5mQZXlbMRpqx8KjloPERL//IYghDqd+LbrQWgoZSW/cyMwsu1KSPix6nDdagQos4pAp1amaZWxDuAZewrX1OBNh+oEcBN2EUf8W6famep2+8jPif+Wr4ZPeDtYn5WkykJ0u6c7oSPxC2/tAEuxqsgUUeD8RcnOlS7w== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by AS2P250MB0942.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:59e::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6178.24; Mon, 13 Mar 2023 13:21:33 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::73a:bd4b:26f3:cc2b]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::73a:bd4b:26f3:cc2b%3]) with mapi id 15.20.6178.015; Mon, 13 Mar 2023 13:21:33 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 13 Mar 2023 14:22:00 +0100 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [cED7MQ2n5ESGgeneR+aluAbSEDh+oFsvx3U/D2W9/6g=] X-ClientProxiedBy: ZR2P278CA0053.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:53::11) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20230313132202.647554-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|AS2P250MB0942:EE_ X-MS-Office365-Filtering-Correlation-Id: 11c0245e-40c6-400b-8f1e-08db23c5dd36 X-MS-Exchange-SLBlob-MailProps: AZnQBsB9XmqzsTrfB3bxuSktp+L/yXkixHzlEOvYeT5T/A318gsA997z5TlAmuv7YzpXqu/hdomVE/s5+iaNR+JbtXIHQh/Nk/wpSIDOAN2k3YFK0bC6arNN/9Oh5AuxemUB8NsX1k9aPBCJKfXPQLZowU4NZzP6k2MiodDbDRWx2xU5xh+386cpn3IuhtZ8C5XoYX6jYPbevNMescRfDJ/0vYc5aowakCPtb+/JA05Nj7DoN6hBzpfLSu6GfufwYmJUFWEl1krnq168ETk4k+3K+D1FhG8K8j7MAekVTjBL+0TIMqXnYF18Ngkzzp0zSmFAQBtgaSjj9pvzXjg71KGnuRAWm/hWJfPyOP+Zv3tdil+4udawOJ7/KGPfeWpaYJUa7lJzvulTKMGL5ubwS5PkHewgLVtlFkc6C86QYL/aCUxr7nZbx+IFhXlJY12ui5m7yyDMSSXyPt9bfRSG1QgTUsxLlFCMOWFgoLglJQtf6iRfD5CHFmlqtt08xN2yjWlnzDrtWxeqrtJHTsj6GRKIZT62WEtEQYi29caTKC9bz79C3RItenBO7AbBrGa3mp4ZeGTpKAknFGO1xPsTt4EV5U7spOBQSGpE3RSXyc1NZh9Ounrhlbk0Zcao7qjz1wVJEPYju21yf36AnK8He4iFrqF0QKUJPRcZq+9FLkhiKNplJhjB9qjN0WZx6guhdo0EDQS0+5COUblnFCI5iJu0OydVxTaaKYHihRniQug6SMvntmZB17xFfYnYqz3/yHPF8Drf93U= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: fg4YfVrPDtFH3L4fQMfH5iWXL9H28K2DwAgDxgYVXoZD/lP+t+lWorfXEJburCdL6OTESCTt6cznjTy/McKZahtINecLYPDgC07pT4WLBK0ubMzLFlBKm5HO3z4mY4WuiqSr/qBKdudvIACFjYPORTLl3OtSxBTXK7+1oEC0VYUU307P+D6S4at9DDbqC+DfunLC1M3KEsfJ6IKN8QqHquZLbBz7jN50dCzsSNkeLaknwb4B7h5qhuqGjbs/nt19lC2ZPdpE4ORe4MEm/1FnzRuIzShNDs2p3x/48FdrMbopCi0fAW5KtWSrwno7aLJVqtH1j3Q4NcwNn2W5vNtCsYO2uam4uvk3pBjeYydCwooDavHMiH4F//bhGLteMXeAoYY7hEG852kLHRo684Ic4D9lDoqULCboRdKp3Bj4BtkO5dP8Y0CqXlTnRKHDwGAjODKYdDtwx74ZUlyAy5I+614lBVFjUC/ba1lo978Ra4Awx2Nstis1I3JgWWc847OdKB/l2wNCgLzPFIzbX54tIWb/FG3Gdjwxbf3M8bUV4Ih5TovHzCh1TRjBMkLhI/VyOSgqd9ApXPWZXLiWDH3cHAh81FQg3r7Wv1tuDNzen2zdx5FGMuZ/ZfDR+gh1/JAJCO36rcJiO/iugsejvu0BAWpciwgs1ppbI7KDub0sRZ8= X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: ot/FQM2az2WTtO/ZJp4Omx0ntIE4KALq9MWhMlD9GwnsXB72W+UnezlSIIkx+t/+M6O2SKGaNUs3VsKZtjH2Q9N5dvRtsT3uZmIKLfh2p69LdA/5PXJs8lNQnpkzIjAWQfZYX626CsQJVDokIpWQsRRlOjJ6+Tz0usd/OP+4+SXXgHdg3SyF/OkXDRwexzmWVTqhs70iCXqZKZHTjmPBp8nYNX3iP4PlJygla/JrwfGbjjDLDC1Q5VXS05RCQZiZwLO6uWdVwcWVJknSnWBI8nH6Y7PdBYxBxfMm96UhMp6U3P6+299q8MmUjZlfEjuTmcaHe2Oj1t6D3wW0qe1d9+DtKO9q6s8YvHuzAi19ganWdIGnq52kz9CDhVCWJh4k4F0mAMsO31GBplv6tlmzH/HD+cSbDBmW7rXlu9x5rG7J9YkiAq3db8euv7sTWJiu7lgVvIOOdx5AuEla1LvDPrVJLC0rIUfTanAMk2eRhx6m1tEh7pBMfV+VTfw5H66XQ+6mbb6ule4lqRQVGPMiMVVI1rC7zpcTFfZte8vFpZ4eNPuqoUewXxTa30/3WVT1Z/gu6xwFE2XZvpkYDuFZxwUy8/negaIIzAqECkJINKpgDv66nYBALtcfS1m2FOSJzzCxk2tFxzfJQJHXwLYw4EYXpFuHvc1KpN7g3ugNIOf1RX2MFiPiwaLNasqtkm4O6x97wT44DcVFKtLXSvbJZwau0Sr/fZymeTJBEp6Xhjs1DFDC/ALpvLcpuCNtjPbSUC6txGBWdQrBmry3O1N65tqfPIF+rsNMkw77mTGxumnTUhehuqhqhJ9VB7SC0g7SscoSUkG5SpKLy8E9f+/Kz0QcvbEb1vfCCGrKkkjG9udob59Pba1br5Dr6/ewoM/Bxg4tHqUcNDyhQGx5mgFT7678ruHGbC9v7ATuQuJGylGP8vO9VxJb1Ne8QDS8KzCOZi/W9KySwoMLN2ZlV6+o5V/dZCwAjh9PP+TyAkQ2nJniq71DCJW6kgLz+NJRyBcRfKC2T0doHISh+ByR2KiQT2QIMQprnjkOWmXJ/WtrNxFO4w2wSXHPuweSZmL4+MQV0S2pcwO4zFGU3rJ9KC7YkntfM6OJIiPGLw3cQ3lD1rx6bzgT+X40mDQuPQmjAY/qsoKdStbesJXg0k/T3nQQoHiv9PYDfsTEBv74Z2d7xdmQ/cdBW1lYig3mMzgwo/721OxW+y8enukQESS2OeLt9klzJ1/MYA6XTzPEK8Nmygfpz4czZLtLw62CFPzUzN0MLV20CG6x/JTYZJfmjZS1hTqGcxrQN79A/LNkdafAcoOAvS6dDewx03AHFW7fa3ny X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 11c0245e-40c6-400b-8f1e-08db23c5dd36 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Mar 2023 13:21:33.2438 (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: AS2P250MB0942 Subject: [FFmpeg-devel] [PATCH 4/6] avcodec/libx264: Pass x264_picture_t* directly 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: LJHcDoHBonsD Signed-off-by: Andreas Rheinhardt --- libavcodec/libx264.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c index e59939a8a7..df70e9df9b 100644 --- a/libavcodec/libx264.c +++ b/libavcodec/libx264.c @@ -311,11 +311,8 @@ static void reconfig_encoder(AVCodecContext *ctx, const AVFrame *frame) } } -static void free_picture(AVCodecContext *ctx) +static void free_picture(x264_picture_t *pic) { - X264Context *x4 = ctx->priv_data; - x264_picture_t *pic = &x4->pic; - for (int i = 0; i < pic->extra_sei.num_payloads; i++) av_free(pic->extra_sei.payloads[i].payload); av_freep(&pic->extra_sei.payloads); @@ -554,7 +551,7 @@ FF_ENABLE_DEPRECATION_WARNINGS return 0; fail: - free_picture(ctx); + free_picture(pic); *ppic = NULL; return ret; }