From patchwork Tue Jul 26 22:07:51 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 36997 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:1649:b0:8b:613a:194d with SMTP id no9csp234234pzb; Wed, 27 Jul 2022 02:35:52 -0700 (PDT) X-Google-Smtp-Source: AGRyM1vj1G7XuesJuUlFBj+9FMDkIJaG+o/lpvppCmLcXkPh0HBFRaXJzrRN6VFcLfn0BGg3OinY X-Received: by 2002:a17:907:2855:b0:72b:67b7:2c28 with SMTP id el21-20020a170907285500b0072b67b72c28mr17361432ejc.331.1658914551838; Wed, 27 Jul 2022 02:35:51 -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 i26-20020a50fc1a000000b0043a5ed3f191si2891973edr.506.2022.07.27.02.35.51; Wed, 27 Jul 2022 02:35:51 -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=aupiNe3C; 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 85BBB68B6F6; Wed, 27 Jul 2022 12:31:24 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2020.outbound.protection.outlook.com [40.92.90.20]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2AFDC68B922 for ; Wed, 27 Jul 2022 12:31:06 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Nsc1MQhjQQEtp/2oBnx87miCIZTTHDNwgIFj7thzkWjAVnK1dwwKyKN3KWwofCRuBJxNXQZ8Q/X48qLkUusWJoJtZIlbq9XQ1Re+LKied8tlxBmxcC8J4Dj6XoyrlaEx00WXIt/nQU9AOf6rMd2TJ8XCLWWQjAI9qQPCeyqC89MRh2MjhAajkx1Huqcz+54hrNqHJMoxGbhF68ASTWHpq306ALMo2PHhBc3k7/Pr3cIuHUJ+yYuxfnvFE0GS0IdYHkBarES8t3J9MCBDT5lAvmp/pfgzGszfZbZnrzEvvuIoG9aXm6EPKEPJSTcSUCA4aF+NuthUKVApjqkGeNoZnw== 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=N2O3340ipuQu3L+LksyFBXzuiQgQpdpDORDOrAvGwZU=; b=gT/EzSkiEuUt4v0cJxEXwm8sBF67500goJpBUOdPx/iBx4u+KYfETr1XUuVFdIzGYO++8iugbWUxgYzVkaJECFH8Wy2sIXpGyfSPTD/72yA0J+sixeRhffCDsn3BWVbHwm/MuPToqhNbWQL4ltW2MRvAeydX9tlj4sxO4QX/MVvwwrud/gq7i4s88HhyiU9gPJ4BITvr0y2xcwhGPYsBkHMQCKhdlZ0YUuUCVcqA/LC2+c2f0gLIpRhiQD+wYQNNqStVJyN1f2YbIw8Z8ZXgudI3yc7DZsTBcco5NgJM9Ocac+wYNBud/oaDijUN/Dynp2/h4D3zurpur+iXyIMtFQ== 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=N2O3340ipuQu3L+LksyFBXzuiQgQpdpDORDOrAvGwZU=; b=aupiNe3Co/0Kz7fXOfCAtVM8wJADvATxXr1/QpYg/N5hQQoZHAmrbvbe8+ZDo3OG74RLTS0SV+WEAA4vdkU289Si6n+iAN2A8SSdU/AeCnZEDSTjqBDpTyPp9mRdaWLtIKW1ymScymc6m9GhYIeLTfDyNq2VxLaboGJY4TGEaFeL6rPo6PD8p2cghvnhSGWKCPcS//ysth0g7MyAZHJVAIvycnuyyNaFnKyLx7oIafWIkIDcsGeWjEwsc9qGt9h2Jny4dMFuE/62+t3ZtF+8iAfmak/f2HE0f1OGEIrXGlrPskxEHuH8y+zrI+R7rv658WYAMBMsQ/YYRL5vXvuyUg== Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) by DB9PR01MB9174.eurprd01.prod.exchangelabs.com (2603:10a6:10:366::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5458.25; Tue, 26 Jul 2022 22:09:11 +0000 Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::210e:b627:bcc9:8c46]) by DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::210e:b627:bcc9:8c46%11]) with mapi id 15.20.5458.025; Tue, 26 Jul 2022 22:09:11 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 27 Jul 2022 00:07:51 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [2wiMJahQftMWPXCkZeXmPq8XHcteqd4s] X-ClientProxiedBy: FR3P281CA0157.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:a2::13) To DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) X-Microsoft-Original-Message-ID: <20220726220814.695563-15-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 44e27bc7-28e7-4f93-b51f-08da6f537838 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQG9fQ4e5wexDZEKzsZPbgBX9gtqYwdqgnuuZWLennEHJ0aemtjQ+MvBKIPaj2Qiep+RikWeSmZxqmOXe7hx8bdD29s0gt+WDp/s8Z+gEpdQJxVoT0PlZpYLdLuI00hCKDFzcWDtfyDeuWnL6XNSt23tYrMarU3qQNgkv9XTkANwmp433hcLZApUFFZBahmIG/eFl0GRj1cmFd0zYuqTIWsNtxNAO2SsMZiPaN6m1iwaJDr8o8cRdFpsL6mJO3wn/6Dtp1tZ+q9tL4F930F+HpvRXo7QQ/8DB6YM1xqrBEEmOvYBJa9jvGz+AoMa/Brj/O2UeknyVrkrJ1HJ1EWTaXfksVDByOsTQVdjdhK/+f4fTKiPOlqBAxaiSXfISLI11XewDlGuOJCi9uAvV7jApB1JmfFtrxNyvHS/Q/tWgF/lb9+zRBOqtHrXEVUUeF04ZMMKJ9EcjtpX2tEtupdW9F167+QtWS+dzam4pPKUna03Wb+mvw24x+hpmzv7XjQEz1/vrtxP3iC91dzQc5+SNnKmJK4YQvCVaagkzXsbn3ILGZ3uvh0uWRVLcVA7lwDIZykgEKDAmy8pUqVOspgv4XBxbhAAeVn7MNQTE2M1UqH1FPqsh9UbaQvo2iQf1bH4tslzsWm1aUF8Os1hjFmynt77ScxqYKlWZVUc8ipmk51XsHQn/FWlrfjoBnUUWOVogbH0adUqfS10EvDL5WJQJdd6VyW/Zs8IxRI/EmW6KbfgMwyKbTP8N4ng97shuAscoI= X-MS-TrafficTypeDiagnostic: DB9PR01MB9174:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: gLc9Uss/WrjRb1nK9ChqDQivR1YBu4MqocIVB1tYN3Koar/h7o2j/ybZ/TC6G9U/SuW1f3k0rcu7EqoWfAvzu15TEloS4hC5QU06YZ80JtS7VGM+J0jmGpscPKy8vWtW5/+dcsgfyzfIcSjjB5hMQisdzul04JErpU8PT+0A3gGMkcR26UHTOW1pEl5xwjnDlySDB8ksVdPmH9BIfnuMtM/5sgJq76GzI9fHlULll8MIijtGIp1Jvl2yyPxxFwHkg/xKCIQCZABAc9Ysh+pRynTDhRy2uL1nFdX84bBjyHCTGJeZK5RrltTQ43hG1jSLG49jszg1s3qTGMsTasSQyi6hu9N/OEOgFimNelGgMVoiOURaR+kCGpLpTy5x1dGwIvLub5ng9eKCkR5G9HqymaXYMfTcjhlnmTzvNN5FHeoFZPNQaq20qTf5i6MXAjuQU22Gcshd7lOuvjY5dZDNcBglNS+XDwncx5l+r2N97t/gKEnjqfYzRVQQ0BZtaPxjtbnsIdR8l/7SYJd3mPHV5U3J+pltJiHL1b19emJk0z8FBnSh1sg2Aw/i0j+6s4r2ysiNU1fZuO3pd7O4uB6FqPjc3OHXwAuhT5db/Sxfnmb6/brUfPODwPWKdgymJhjT6Nj0U4sD6EolqI1xvT+vUg== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: BHIH5joeFhQxFzlFtiuQ5mfiNkxqk4nPaqoYbLshGrF2aBudM1FFzdJQCoiFydVhqhKlW1VdIr2SpUQpuOpaQhGG0sH3PhsLkYRYLg91nH1zsQgNS7NEs8Uu/nh9VddUWzel58VtLIEjxtApe9m7Mo5fBwaO5BqlYRbNCY7Yb3Lp3zkDgc18zTGdfxRimo+aonLRwcBb/PKEm2mt4Ezw58g4MoeC3qi2nOqddgOVDOx7uqGp+7Lcxx0XBXmeA2pdw3YLTovO6vigWKGbH1Seoi72ONs5RsOXBYOEah46fnOAboxDOBjiaVlAj69WhbNYtYKDVoIqoh16o3OilaUOuRMpiCCrsspKvJNA4chqw9nuQIaI436v098f9qXhS4Krl88MfVJDf5/gWicqc+taT44FJMgoUbnreQZQ3OFLhQCPGjl2l4VqmwV1bXLWBNenmbjV0i/q027y1rpR3n6WTp8+a1XXvgJYsfnAEtgvkR72YpTg9mDcf7mVx5AhcL2jSXkeKTJxIe504KZ85mvBSl3OyiSpn7mOQ38Qo55LSsyxOF2IP/7Myc/qT8BeFm4ZnE07CrhGhrGHSwA/9IO1CfQ9pmVXq4w2H71zaEtkR/ypD0V+LTsy7bu7J3X0/BASxM5BMKyn91G49vbmyE+HCdbo1iozgOzl0CO3lUT2EH6+ExuUxaX39I/VwtdV1WL/o6tblNYWbREBVkcDP/0dGK1jld1nEsF90EIIOqCdchGo75d7dMSLLY88vMuAddPwC3MD6mTyQklMU5/8Foq2VjDQxmhMgD53y5tP4xicOeNnOLkOEPrPONR9SFYhHwc4R8V1wVJcb2fGxvUgEO0GnC+hOeQ5Bi5WeMIUgOCeji1YoGTXV7Tk6qJBn2GnA00NyEkXNR7Qi0WJOlXK1arozmV//jq3H9Kz2YPqqDbR8A1zmW3g+6ZlGhjSsX/RFkBxGtM52coJAR/S15iX2HnQmB3PHVvrH5ooOJiLDJSgBlCJgA0P3Jwxev/LPZGRl99QEKcQ8O5qkmS74gTfRfAxB54H8Ay+2YVMBlZWkBj4LSp4xqpH8XIrcvSrUvbq47jdeP4/rE5lsIMYfEABtgyKr1vgyYQjCOfm/8jzMQFPu6jZHArU0ZI4ClT5N/gy5orZZVo1FzTE7Xbjpx/99JXfXkRMPTnL7WBo4ked+mBRhKxLdA1IiPjQa2gthwwMYMYb0mg4edCTFrF85GH4my4/ya8bX3SomoMcJth0w7Fu7IQAb3TFegox3oNfBKD0wm5NAetsp5h1yQEI1D0A/5aslNgmaohw7of4QubUD8aA8LA= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 44e27bc7-28e7-4f93-b51f-08da6f537838 X-MS-Exchange-CrossTenant-AuthSource: DB6PR0101MB2214.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Jul 2022 22:09:11.8641 (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: DB9PR01MB9174 Subject: [FFmpeg-devel] [PATCH 16/39] avcodec/xwdenc: Don't modify input frame 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: VsfT8UebMAML These modifications were actually meant to be applied to the coded_frame, yet 08b31a72dbcf2935e871ef7c1ffa96ae200f78aa changed this and so this code has not been removed when coded_frame has been removed in 11bc79089378a5ec00547d0f85bc152afdf30dfa. Signed-off-by: Andreas Rheinhardt --- libavcodec/xwdenc.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/libavcodec/xwdenc.c b/libavcodec/xwdenc.c index 0c6dfc6569..a28fca08e0 100644 --- a/libavcodec/xwdenc.c +++ b/libavcodec/xwdenc.c @@ -31,7 +31,7 @@ #define WINDOW_NAME_SIZE 11 static int xwd_encode_frame(AVCodecContext *avctx, AVPacket *pkt, - const AVFrame *pict, int *got_packet) + const AVFrame *p, int *got_packet) { enum AVPixelFormat pix_fmt = avctx->pix_fmt; const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(pix_fmt); @@ -40,7 +40,6 @@ static int xwd_encode_frame(AVCodecContext *avctx, AVPacket *pkt, uint32_t header_size; int i, out_size, ret; uint8_t *ptr, *buf; - AVFrame * const p = (AVFrame *)pict; uint32_t pal[256]; pixdepth = av_get_bits_per_pixel(desc); @@ -151,9 +150,6 @@ static int xwd_encode_frame(AVCodecContext *avctx, AVPacket *pkt, return ret; buf = pkt->data; - p->key_frame = 1; - p->pict_type = AV_PICTURE_TYPE_I; - bytestream_put_be32(&buf, header_size); bytestream_put_be32(&buf, XWD_VERSION); // file version bytestream_put_be32(&buf, XWD_Z_PIXMAP); // pixmap format