From patchwork Sat Nov 19 02:57:23 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 39334 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp772257pzb; Fri, 18 Nov 2022 18:57:34 -0800 (PST) X-Google-Smtp-Source: AA0mqf6dezMYITtOuN9AEkOKP2QyWYosEb83YMXUi6EA2FQRrx7LokZnMbBZJH4VYr2QNasR6q28 X-Received: by 2002:a17:906:3fd0:b0:7af:9bff:8de6 with SMTP id k16-20020a1709063fd000b007af9bff8de6mr7726985ejj.91.1668826654035; Fri, 18 Nov 2022 18:57:34 -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 hb44-20020a170907162c00b007b2b5ab155esi2464969ejc.363.2022.11.18.18.57.33; Fri, 18 Nov 2022 18:57:34 -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="sE9L/UP1"; 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 D7C5668B9AC; Sat, 19 Nov 2022 04:57:29 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05olkn2051.outbound.protection.outlook.com [40.92.89.51]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 977F268B4A2 for ; Sat, 19 Nov 2022 04:57:22 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ffAhhw1WXk/ne7x8KzMu25JRUTjfgQJiVB8Ddglv1KijwycRclofEmrOyq75kamEgeC391d3FxurPmpom9x6+Fs1ZXCP7/q3TJzAUIi35pjlA9Te4xPE0gFVRpyAmpGMRVqB9SDey17zCfaUE/BwHVuFj34CA67p3sjDj5axnPB+YyYYyz5OLvlNkyLuc+bTyeWlhFQQG/duZmYzLRoAa1HDHyFciu/s3GYTnNn4Q2DLLn2+ocTFGW55ZTY6ziOgBWZDMoNs45UWzWM0RBlX0yMJ9AX1oA8jmmVz0vi0lQGLCQDIW2uqJW/oI9pLYSULmSiJjHD5I3T+ls4VZwF6oA== 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=25H0/wc63Df3kC310/ITz+yFqtMIN5qqnIR+2Vfiv/M=; b=ilOAVbW/wJ3i4YMlQ/MmqX6MK2jKeCTSzm7/ApH19x+uIDFXqYNULwpIhX0WFxsckd3rIsGZt36Rdofv1g5dbwgKqV9ROteCa/H559yCkRDU5yw/s+YNaLk/gyMtJdGcKbmuw47qdbf7L76uUgdFEdsWFMCsLBFroAHYOFcuawFkEViHAWwSfE0ZGwetC5aYQT2Av2zCQVtq9OPwTSomS8OvUxfNmEgPvZlKTIzgBLs8oq1RKTrxZbsNlrxe8rSLQUmXZpHzhABvNWjo8FpLexijRcH6cT/sdlm2z4N7bN3PlT1QIMPXnqBgQaWdKdXI3tLpLjb5ADfMaSusQoikPA== 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=25H0/wc63Df3kC310/ITz+yFqtMIN5qqnIR+2Vfiv/M=; b=sE9L/UP1MqwFuZF3Bg1nDwI1c8lKC8+W+K+JrdFrU8Ie+OC3inyqyFdy8sZedU+//UwE22fv2oA9qT02VIyRsxXMdKMLN1VXNfjlG5HuwJqYyEE7xWUL31j0SjQ40X1BfciKJHkAVF9aGnAHqgUSDieCM3OQey4lbgvZWmIolTbR56aw9lEtB5VPP2+gdD5NmoHa+JBjcRfA3d8r5BJe7JT4WmRbOtDSGCrnAoGMF7d1+V5dpdhtOMEWyyRTTuBz9YdPaQEpMmibB5zvCF1XHJ/A5D2oiVrLrGYD1QdIJY8Mmkus7K1AmVppPbIc+aOwQ0my9gwQzXaUtxumVgjr2A== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by DU2P250MB0127.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:270::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5834.9; Sat, 19 Nov 2022 02:57:19 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5188:7559:45ea:5f52]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5188:7559:45ea:5f52%5]) with mapi id 15.20.5813.018; Sat, 19 Nov 2022 02:57:19 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 19 Nov 2022 03:57:23 +0100 Message-ID: X-Mailer: git-send-email 2.34.1 X-TMN: [2gWu5h01KB/QD2jbXZKn7RGs2r3lRptGFaVM+4PcXfg=] X-ClientProxiedBy: FR2P281CA0021.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:14::8) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20221119025729.1758478-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|DU2P250MB0127:EE_ X-MS-Office365-Filtering-Correlation-Id: 229d6b6d-82b7-4565-b3c1-08dac9d9c52a X-MS-Exchange-SLBlob-MailProps: AZnQBsB9XmpdHtR81+IA7gDwjaoMToLsW7BzcLAiDYD6U+kdywPUw9K2pqdR1asaPAFfUui90wpZxP+zXmwMGvq3pMghBP+7wiAUglB9FBe12geMJ4XVnFgwYfxWmYaiFbUPwe/ptzr4hCYGn6FfR5Ck26B7gUKD5qn8EyS3mDLN0nn1NkbP25INmjS9zvBNNrAxTEXgg0RIFfcSCodjavhNDgGO2+z1QUrgDAso5G4pnJtlgGflPZMJhC9KP2dy0KzzCsgowRvJXcDnIe7q81LT1gRwEbdDT2DOrfaVSTPcs7GkD7sC/7GYK9RfZ9Z9VOmHTlpxsgqvgiC81dtk5jWtb2rFLw+UmeBIogY2HGKEaEBO9UmHN3N0ByLfJ4yMYm0cPQvzJM6C74VzAZNvvTJuRkQGiHmT59u6Q6M63mOyPCfurpFNAFvBZHFzvmXFRXAHF6llnjy+fR7jQlaygyqhf1t4xHsk4naL7S1GgMSffCp7W1LDGDqV3Da6YrpxY8RSZww8uVJOrAovbpcn30nE5jFXKL8xk2766YqmLOvFR4HhCmTamdwZ4Ac2rUb8y0yR3vdl/LPB0hxboghvfJJotp8zFs4pLGID8uHdU8q9Gktqs8L6cPkP3pwypZtoTQoX/bWlTQuJAsqiS+qedYopmHObBZzhO6y/IBLs0AKrn0OSDwsZ0S3ip6Dyx0Q+kN85WRv4x4gzWmksmRaEDb9SVV39D6y7eM3f0SXcbJn1ROzmIaTd57vZUFkjfIdmJor5rDN7/ic= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: noLH+82TOY7qBcExw0/pEeoNdsIpV6nPdHDKVCae9mOeW7B7d48YdUiHlNAqXcsefee9ZxBPzi0tz3y5B03fiyErd6LEMOZV+P9oGqQoVVho+yBadgdrjlMhgwKWFogxpWYlhEp3Sb+5+R3RnU/HEE4bB93DsUnGfnICu0DlSxf2N3otRdTHEgdZMZ0JOd+WY5u47T+ITaf3qmkLwcDoB6DxGFO+dWWeBYuPXdYquxzQgIavh3HZJmf3KY13IYXlFZwyIDthqFEg9s688T8MfVTfPAbww4Fi2Xyn9qQ+alpzD0u+P9ATe/J1xVLKWVnEAOyGYOc8YO4FbBbfbbN4vm938KipZiRuCs8WT+jk1SzpIIbXF6xnhvCGdPOcFcn5F576fh199o1UkcJizo6MSoeN4DnnEq8dsz/wBZ691ZFRGTCBeLef2KwDhpiEm3Jav9725vxNC3FoaiXY/i4eYmpOWUvupDmxbFOTiLFlyDyd8cGnTlj4I8talR6PoFFTJcDu0RTPnDaKf1uAObuM1dv4JmneM/b41J8ISxjAKb/6agVPs1bJxr7w4g0M+6JOlv+zz4xdUpe5yna9t/AjH02G52HC1AnJ5arAvXJaNltexSaxw1uN+RKCNDAKJsoTcsIjU0iV71/TYnp9Pqkt/Q== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: lkugL3Pl+P+OhjJVEz9Gj2DHT4Ye7NVAYfCFj4/WB1KIxUCcqTgz7CcyIeZyi6D92rqegtSRAlxzcbj5uDm8rzpJzkAO8I0kOvCXDQLcb80GJQWXKYQ1iTrx/0Un38IqbYf98f1z/7HwP6ojfEpF/saJcsxrlK2fENOccXL6pF/j8oZqSRF63tHGo/pG3kSDz7Cq8IXaZMgKlCXGi7BMFXdYjsXYSJefjUPmXZ9PxoRUCsW8wAUwT7F0fxZM0GwxSfhOB5en5pYjVCntya5QpH30Bn2VwH8ZT3ZdwQqMYmwIEi14EuihLkFSPo5wdnav7CDpS7ecd2tPz1PmBM1mtPQ6DCgAQhCBTb8Huje5/319IEIm28ZD4Xr6dHX1AQzZsLFqAbX+7cDPi022qJdboyfPtwi5oP9KHvK9SnJ4LetQWZNiyqhRImKCEMWr2kS+TTlafmz28JxzFA1E2ZKS/rdKS/iYtF9whAg9xEfpplOuFl20M9/ljJ9eYE2PFMhrmCaez/Q+1ddak7hjNvo99XWVTvWlyGjYbsscHhPWjAGhsokq2c9J48uxMbrL6i0GWnWRABHE4aGrpURN8QReCJcWXufPvRr4P8Jr6WaKz3wMituTvqQnuGbKULgmLive7qZK8R6u5b4liF0E71Vc+ohjDz9Bnbypy6B5NwoaoTAaW6m6GRfk/HJpHbe9FUguJfn+TBX6bWSxa9rAdnpxz7LJFSwrnlcMMikqaiYKWpTdxd/HCRi4SeR94m10Uj2aSjAoloNWoDMGA2B9MKC4tfgzV16W2VT5X2Gq2iz+nY+zjBuyBwvlhmA3UDND1lKSPzmjjW8WMXxBJBSTo3K8sIjO0cmy2MO5gj2Oif74PQ0j0vf4sauUV8Rv1U48x/hYKqkT7cX7PgmD71xWKJqLdrPjWGyxaaRFzpQNckfFhjgntGuwaIB2NCGy2AQB0K0n7uEKbBcGi7ydHfadQErXrpNQvaaQ4+YmpqB7z8wfg/0HVBlMC+l7ayXGADFZ3p0SAWEoX6qI8isVioUiNnV9GDvutkTxwtohsh7KK92uAse+0/Wy8iXgnlo0s9qOZOw6tuLlI1bVymdPCzniwJgHCsg8GpNDVcEN911q/UwvdiydVYcye7/g68SO8SAOVWLLM5th0X02djLLHGYGL/3V4aL3v4N2GmM36ySmRcYDdAlneXlSHOt3lLSwuH6BtMHTOaq2BhCl3Cd8F10cZXdPLwZOA/ENyuZgPRAoB3foCe3vbIQeqXiNnc17qfaG041Nbp+WXcYCliOEAxrhm3dINn6//Fbd/qsUbE5LX6xXrQI= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 229d6b6d-82b7-4565-b3c1-08dac9d9c52a X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Nov 2022 02:57:19.6841 (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: DU2P250MB0127 Subject: [FFmpeg-devel] [PATCH 1/7] avcodec/pnmenc: Check av_image_get_buffer_size() 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: WoQrf85MKhfT Fixes the crash in ticket #10050. Also ensure that we don't overflow before ff_get_encode_buffer(). Signed-off-by: Andreas Rheinhardt --- libavcodec/pnmenc.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libavcodec/pnmenc.c b/libavcodec/pnmenc.c index 9eb663306d..c998dd410c 100644 --- a/libavcodec/pnmenc.c +++ b/libavcodec/pnmenc.c @@ -42,7 +42,10 @@ static int pnm_encode_frame(AVCodecContext *avctx, AVPacket *pkt, int size = av_image_get_buffer_size(avctx->pix_fmt, avctx->width, avctx->height, 1); - if ((ret = ff_get_encode_buffer(avctx, pkt, size + 200, 0)) < 0) + if (size < 0) + return size; + + if ((ret = ff_get_encode_buffer(avctx, pkt, size + 200U, 0)) < 0) return ret; bytestream_start = From patchwork Sat Nov 19 02:59:50 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 39335 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp773121pzb; Fri, 18 Nov 2022 18:59:54 -0800 (PST) X-Google-Smtp-Source: AA0mqf6z+gabjg3I4n09Sq1t009AJQYRUDpY91wCNwmTyaOwc3klO6w4TGns7PubhZa0NrmNDWgy X-Received: by 2002:a17:906:2ec7:b0:79b:413b:d64 with SMTP id s7-20020a1709062ec700b0079b413b0d64mr8025486eji.538.1668826793942; Fri, 18 Nov 2022 18:59:53 -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 gs37-20020a1709072d2500b007881b45441asi4553835ejc.721.2022.11.18.18.59.53; Fri, 18 Nov 2022 18:59:53 -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="Axp33ie/"; 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 2266D68BA23; Sat, 19 Nov 2022 04:59:51 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05olkn2032.outbound.protection.outlook.com [40.92.89.32]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 859BE68B361 for ; Sat, 19 Nov 2022 04:59:44 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=aVpnXB2I54Xs5bRu1PCQvyb59WXgk/wKA5d+b2C3y84911TzUslC63rGrCVmsfi/ldq04v80vfJKXot5qaHNyj5QI8YhJg6f5ViM1P1Uh58FuqkoBo8uKHvicakwx3+NQmGZ3xFRpCVBOFOZAPsD2KQfuyNb0gjSCuHVhxCZfavSQiQ5o8JFaNBhQQ/wkxvEl6Qm/DctYlmisfYhZQDw91sR5ffQbsw8t+vim8LRfauq3Gs7EFS/RUMD42c8TljLvgirsH0TbdAlvhA6d6VY092ZwwWflOZ9ntKSSckwx1Eb9VmXW3AEbG4RNhgosHBmi3Vuw2oqlj/0gEE2tCiTYw== 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=h2TNaKq2n2tAU9rV3/GFzg2LiUz/4FaUBiJAkQXj0xE=; b=aaHskc+tpMtiiKq9nHlc9dLuQvNq1Z2UcmZYnGXRC/8fLUvDUCbeOJw9GtSBhLUh27gTuWpta7sMRtXcSZoqk4Dt5SsABSqsqu5BRdaSfQVgG4IQnB+LWiuDHywEDakkG7QXh6J7LKOS1C1hwe3OaMCB1aA0xmP0DOgKETZ1HtvoCnuCXhEMDkVsanBI2vZ/FRt4GmvruUsTj4DR5MkW7heLk3s8bfGupSifLVJqN01QCbivZWMhoy8k/e3mbbB5StDETTxNHCvM6FJ946ws7k1wH4P+zMxyGE2MP9OXTfxAO4yJz8OhuCiWDsRPtWbtusDKLwrtOmP5YtN1TR+B1A== 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=h2TNaKq2n2tAU9rV3/GFzg2LiUz/4FaUBiJAkQXj0xE=; b=Axp33ie/WmCPqboaFhnpVez+CNSrRqKhoNLzfLCb495np0YICXlKoY4utfkXnqSbw8LTw/Su4vRc+QLZDdbYSGzHG7IgLH5UQKc7OlL/FWQ07dyAcc+Ev2uQg8p/Q90Wpcz048MkyAN1CDwoBc0f9r9HEGJX4gTzLqZ/WqMldDJRoqPPVAAZ2de9Y76WJieCILFJoJLWAbGrsWUlHkiCKlHlhDe6MIAX2M2FQzEopr/FOEd5IIQ6M5uddbPtjHS+1UtMjKMBa1gaDSvCmgryz5n3ieySDuA7h5b1E/3Tg9zXgx8SYpd1k4Zq4QsVNa396kSMecP53vtJFo4JIldsRg== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by DU2P250MB0127.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:270::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5834.9; Sat, 19 Nov 2022 02:59:43 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5188:7559:45ea:5f52]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5188:7559:45ea:5f52%5]) with mapi id 15.20.5813.018; Sat, 19 Nov 2022 02:59:43 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 19 Nov 2022 03:59:50 +0100 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [UzYpD0bSF9xanCyKq3a4cJSNm/Y+x671+P8xNoQyj7s=] X-ClientProxiedBy: FR2P281CA0044.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:92::18) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20221119025955.1758795-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|DU2P250MB0127:EE_ X-MS-Office365-Filtering-Correlation-Id: 22e3e28f-2d87-4cb9-9fea-08dac9da1baf X-MS-Exchange-SLBlob-MailProps: AZnQBsB9XmpdHtR81+IA7gDwjaoMToLsXNOMXC23+Tef/kT0NAP7BpBPGRRIGceiFrgveWOzkyt5fDkjhTGwy7Pc29/ie0VEG6gXc6/7JdWbvwUeucfO/QybfAhnc/eM5Bu+Z3dunu83rPs/NC4iD9LR7LkjB9hmvmM08TIGNJlJ2mQE9e1Km8UCGPSZ5ygOn/m0+zmc8MCoes0CP04bxOn9CKWeRV2WDbu4GzjjC+lR4pcOnWo4Wm/gTfytwARtbS+ij0z0Z2RYrxpBQXO0tApBX3poNJi8hLYaPnwl70Lmu80nM2uPeYaZ/UwCT/LlbujUsUg2P009SwOOyMIljBzeb/CzfGL80vAw0IqySw7BWMlWs+7OyNH3eoCJWhMT2zH8A8KxQgGqmYSXEjAB9xg6JPUOnLHmBmyZ0uDz3Qj8NEOx9Oqvmu+O5GaI3MvACImO0MUc1FEGiQgm66s/YT/eg/Z/b0bqcC46OagcvsbeiENxLg2IBhdNjnfVZy0hgBHzGfVBwea30UFfyu6YAhj340Op0Iv+MeaJrQs5Oix+S2RJT9K4B2+KYyvQSk5RYtaPYwmo9gsauw+GLqP2RgiWSNypCkZW0mqd+uDlMdbcPhI43gt+xYlm9g5PmUTaz7DAs/hNFC8uTs7govE9TFQ7CtZGANSCACQ/rnK06pUQDcsnYr1egmWIXIFDDqD/qw8EWYJfgW/shuId1FW6FZjI8nj+eY7XG21Fdp5TMDklK7ujyeL1A/9nQRRuVXI8xOB7oYUWD70= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ijKitpiMFQybhTPVP0732vW2IAGOC0g+7hpxLqhir36K0se2AgcONFMZx8MzrjQJ0Y1meSdvtDeRYDFrMLrAB40veYpKuFycBUtEo/SV0H3TvumNWWz+x5dXRQKeP92J7vS/EaCzEy9SbEjBjH0PeunNYiFtEZe/GqW+L9OP3EsxxfCuqiNArnRbk5RPHhkESuOMD6XRuGchMlIutVxYdE+Av6TeGXw4sAnAdsPyh03ryszxak8aDoPQbIAtWi54WRwsIeAZRdUWQLHr5cFRhmnOTU5gxukn9fPA4OdjXUFSfZssY9wjxrOPhb0IqunlC5SJS72clqqG0gSSiJn16HMtJmq5AI2UAGa1wY1jY4MmVXNV+mMAEsnKaankxMtkZvngo0ZK3O+nhg3Eey34KZ9qeBMokKhSmJP/DJSDg52pvmM3JIdKRWSLH3lajHrebeFHNFEH29RcR9ZnaLeZC4az4ewPERI0dn/txxB9G6zdpCtzEmSow1kzKnUl1kIgxBAY5IsfYQmBY8UFX9v/JmEtil+b5FP7gxHZg3GMzp8IvYqp70ygrMgFm3/Q85jTZmRPsP/ch1gJE68SO3WlK8gzbClv3ipcNz3JY4LX/ribKOJpXNN9TSxUhB2cv407Hotc+0cICgIhLltgexoYwQ== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: ngMqEw6xtwPEvb8SclyvuuWp4UjeTMNH467vcPuvmsPXjcAhQ120OI3adk3BysyXgZLunFA3cI+YwQiq4S87Y/yH85OWzz4BGSjzo3sy584VO5c4bRQ7eet4G8DQCShwGXS6WQqJDaxDx5GsVrbV5UIJ//gsClmbPMYK3rOCuiQQtED5zuMnMVnNU/MfLumpGAy89vZqO8dbsCJ7+LSLuaT0gLWb9j7QBBMUtBFN/XuqdSr0QGo/tntLioLwhHFUMdiRwkRe3RRBTKq/kEYbuQeKPNgnrjYOGQb2mHx4Hp01Oh6ERH+lu/bP0H1fQWIO+JXiiS4uuEGScdV+c2kbTRej3asXlonLmE7UMvpcVidD20LtQ1KzKQLNv+aFzEmgwMewXTXw7+wU5EP0pPSCC4pZJ5wrMeFFiIfDA3n6QQeN9ghY/T5pv/NM96ZZFXiP0ym/22jVaymqacjclP8sw7POQz0q3cw8saJATL+PXi8b12sfCmlkvUCJhc6dhxuMAewdRZ5LnmQFWmEdbCeZowrws8O1Eyyze5e053MoebHFWWMvrTSv2oSuc+mhyFqonD49zy0r2YG4VvHoc+0AIQe7jfNgjNGf3KArmvmHWkQL/W7VDjaa8lzbEa/vULgbjvLNbhklgJ6HGRfGP12iI4x4QRWCLJGgWdw9Tq0lhsPYpJeNfjKkBkgn/q7tpdjP1KTVoqe4I3V7EhK+3VQ782ix0w3IkQEKyaSsVWIs36WV+x/tp9F0u9kXvtPvCNJaeUuQsnAo3q4KMKODG7cZQkkGwJLWGA2lD22COmNtEHkgsutx25meuHMlv9VnZ62v4qySgpnSSiFdWveFCjFHDu1W8uMHXF+V5mViuTQZ0FPnC+eFijxgGVQO+zdjS4XsAy6gvPpm4j8ieRMXxi/IY+Uu1aLhSOfMbw7Izg4R05+hIMHIW163SL6IqVfQ3+NdIDT4fUz8VswzYyUm9V4mqHzvzPYzXeXXGG24Zt4+SmaDO15HXm0x+x4t+OTYPnB0i4NTcf2iRT4DYAHy3sZG+HOFF5F+fqUJd+tHdnWy8tJwRGvcMur9/bYt9rvIEyArLRj6VqcLN0SzDDhtZzd2F+PQp9n7+GwLmfkScJul3iXuGCeKHgBnlGu8hw9kk5QmOwuFZKHJvMfsm6oUXN6/gvjDchJ76uY59NWu5gAoMaLHjZjlPlL8zMhqXBXvsldm+ljtidJU/G9QdvMv3tbY7g9SOLcOqCS1xlSHh3kGAEjcnJCXRyRV4MjtM6AsT3tBR0OQg49lV89boCqXoeX01Zr1PfDucA+hLTD2d8EscSk= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 22e3e28f-2d87-4cb9-9fea-08dac9da1baf X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Nov 2022 02:59:43.3081 (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: DU2P250MB0127 Subject: [FFmpeg-devel] [PATCH 2/7] avcodec/flashsvenc: Account for header in packet size 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: bTnbEMiWHm7x Fixes ticket #10053. Signed-off-by: Andreas Rheinhardt --- libavcodec/flashsvenc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavcodec/flashsvenc.c b/libavcodec/flashsvenc.c index 35793400fa..9d065bb92d 100644 --- a/libavcodec/flashsvenc.c +++ b/libavcodec/flashsvenc.c @@ -229,7 +229,8 @@ static int flashsv_encode_frame(AVCodecContext *avctx, AVPacket *pkt, I_frame = 1; } - if ((res = ff_alloc_packet(avctx, pkt, s->image_width * s->image_height * 3)) < 0) + res = ff_alloc_packet(avctx, pkt, 4U + s->image_width * s->image_height * 3); + if (res < 0) return res; pkt->size = encode_bitstream(s, p, pkt->data, pkt->size, opt_w * 16, opt_h * 16, From patchwork Sat Nov 19 02:59: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: 39336 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp773167pzb; Fri, 18 Nov 2022 19:00:02 -0800 (PST) X-Google-Smtp-Source: AA0mqf5UIDTACzPPrr3r7bVdFlzKAhORYBFIJbGI5vvTG6SWtTw1ZGfoH2sZMiQzmiNiaHXXRmAk X-Received: by 2002:a17:906:ccd0:b0:7ad:db82:d073 with SMTP id ot16-20020a170906ccd000b007addb82d073mr8237118ejb.480.1668826802451; Fri, 18 Nov 2022 19:00:02 -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 t13-20020a170906178d00b007aeef4dd9f3si3640241eje.305.2022.11.18.19.00.02; Fri, 18 Nov 2022 19:00:02 -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=i8wCJXfW; 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 07E7C68BA43; Sat, 19 Nov 2022 04:59:59 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05olkn2057.outbound.protection.outlook.com [40.92.89.57]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3426668BA82 for ; Sat, 19 Nov 2022 04:59:52 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=XFG+cE17St2Vy7WfjqRabMi+wqzB1T9h1Ep0ahEi5v3BmrgHxcFIYtOv3EabNKEPiUs83+wAaCfb23zqkzkm1SiWa1tV46H8vFGzCa8sRwPFbGHbbfGCYZRQo2X3fBWHkZMlQGWa5dXR1M/oMcuzG5RALah8XoLVrEPruYCpRhG9sdVyYg/ocLGVtqVUctXKf7QJYcJfC7tFytyytebGVryEYXk1VXxza1L+kDFXyRv+tINT2ZoDJSXeeOVMJ8uZGXaJw5RdWT4HaLQRxXHe+u4+vB0OTwweoMGjCWJTZoZM+8wW2z+GEK4uVwYsL6VFXckrwiuuYHVE0y9Hq6Eybw== 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=o4FzRIJ9neZZzt3JsNaBfynm0yr9uwhcCZclK4DEWDE=; b=gZM6FOcdh45hqmGUl+eV30U0hsPqQ8UWpnhYBHmqzdKoW34dTOcIb8MVzo78w5yu8qOqUdNt/YQQJycmr5YtdDXMeKsN3Bc/l7OJg230ivTTJfbng+YWjF8944A7Kj/F0joVUk2+0teDkW7KFE4RzcLMcOOJj3vpelXa25k6EVKDJOZompWzU6A+J0y7qfmFJvpQSSOUEKofL2rGvT4RdBoHiUZ9r0pVyE6i6Mjj+LGhHZjh7XBnYwFIVRUUEcuDWfRNQ8qqucH5bKxm3tTa9p74/4kcdWkE/MZdpW6ZgtpofqS0YNzdIhuKmpF7JMeVMGMNoaM1BsMga6/4cY6Vig== 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=o4FzRIJ9neZZzt3JsNaBfynm0yr9uwhcCZclK4DEWDE=; b=i8wCJXfWK3YmWtfkAdDR0EUFrCeR91h+chX+agKVET3uUo9+XLTx1btvKlaNID9MXz1Rvm1MCyvFqkCxOmEcv9ReyibbSFkuC4kNlYlt7BFKkhDrV9YdHqNG+WYge5t/At6KX2cV3TtIIaUa5GJGPjkxFWwIwrckJecUo/kqG/gNFo5xlpQ3TNHNuNg7WLW+DS7S/RKnCoDwCCbWMQUgAwJheipedGYxJXygXX/eMiKeKeLXER2mvR0+U1ftWjhti5yMx5z0draX34xnwBdly1nTSSGXT936O6BkXsrzRiqAIZ7lNRGNlotRSIge8Q4V0462HcM3S8BhEEFz0uisxw== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by DU2P250MB0127.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:270::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5834.9; Sat, 19 Nov 2022 02:59:51 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5188:7559:45ea:5f52]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5188:7559:45ea:5f52%5]) with mapi id 15.20.5813.018; Sat, 19 Nov 2022 02:59:51 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 19 Nov 2022 03:59:51 +0100 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [qUUfxOdPfc3cGzdutYXyQ2QvL0Vonoz83SBjBCFoRu0=] X-ClientProxiedBy: FR2P281CA0044.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:92::18) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20221119025955.1758795-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|DU2P250MB0127:EE_ X-MS-Office365-Filtering-Correlation-Id: e9490086-6f13-497d-25e3-08dac9da203d X-MS-Exchange-SLBlob-MailProps: AZnQBsB9XmpdHtR81+IA7gDwjaoMToLsc5QXJUrRZAHXtpOYmDVIrNuK4DTasS8WQi5LOKjLrsDdP9xzngBJC+dGb+PqbJGhm+ZPjgY7h5xmhPJXppLsc93N++8QdMqBdVV/cD89ei6c98MQoOEVhBZPLoqp6tKPipy6eGcVu83GAG5ukuYXTp00cJ2ZXoLxjyIyGMVlhYW2+jpzI+GM7AcVGgpR8yaaGOhv2QNofGqlZnJ0FPZRLxF/5vrkBfUtsmX7WBEzlXjr/3BJC3HZVE7dRR6pKLvcirQvpOBl/67iheTA4/JjOABbYg+XyuV3o3T53/WamVUDH4x7ZLIU90+Lf+CRzFfgLV6vb+JGUuD6++6niBfxKCZtTC75FXvr5fCwD3VutMopOb8uD8Yj4wjMPCp6m73v/MnOJ2QxXkQnerVpiMlYOFXsJ304QWfX17xlw03tKFHxMhkOIBgpW3iYpfoOmVXPoib0Hrgv5HCQa6m8Tc4mp3mR96I4ROZko6JC26gTTah9cI3fUE1Qq6Hl5TlW7dj1wKUJFp5yamX+fkgDZL6gwv34RFmCmePJ13FAc2ZcWzU+/59vKwjvfZH0dVafDRwbN9hixfa8ynw7LeA3ito3vm31hDA/r+nSujRpI7UJcjzhVRwto+iI3bKXU84cA4QM30atKr8hCgfRzxjyVfOK4kqPsG0wPrXKCZZhV3pzz6f3BFNV1O7yDNrm/mTFCthZy5ZOJUj/X03aHp5xiZryvljgGhoRHqsacjbRtEDCwSU= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Nwv0XD7wP4Y9FvaOkRZVd5XZtZBlycKdQZEiFul7IBBpocNmoZXGZ3ZRnAq9HKyw+XPeU8+cLhQk1g2lMns0WhtU6cXXF18ORznGKRKvZxmKe03SLq0v39X14G5NQhVdFZ4GeXEfekAQVZvDKPdXG8lZ1VX2R0oqkb278JCUTCRijNlGY1sPcDWeac86VrEfffsciNi90uLPu/RJ5xWQvI22/MZ7ozL0a1lmP+P95P8VErmXemkBnFItBR8siRq6JW87X9/6CJad7S13D0KKXxmOCGLNa5ob3ZwBaN7SXEd6dBgDN2YQfoK4POSU49ilCHM0Apwvl1lCcIKzKTWrb5Wp1nVrPIq7QPIj9pCCfH+jw9kRPL6+vR7krcRG8n1+NJdSJAca2IMzceLTUQ2p5M2VQIiJa+5Q8NUx4HmAClDuxMfv7v7cvaGgLf75qdVcLH5EREqmLOeyEBbkmDB7YURnrU4A+lUJPkZabTQ/sZRe2XSvQn2bWvv02tL/e7CrSLS3CEo3IJd2FF7gtSx1sy+ftg/RzZCGH5uV9X0jDDNHhKtBG4gUWsiLncFIPOTbXGFA3EuJnTbjTr089LkbiLprtAcEopmqysd302ifa8z9dOvawegFgnUIcguDbQgHm6eE5grXpYhtqD+it31+HA== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: YaTnmmYtjCnqdb5+vUNUiyzReP5WMT0uEYGqg7xs7tXQQmw8Ncdon9E5ZR0SN1tCXu/iAnBLXDO4VzRWgDoiomssASh05y545fXksY9I548MgusmV8K5rs4AopAGQU3m0OzA0u749sEf6JwgYvgkuowygHB5Vq8+nssphKRfQo3881L0ipJup8hThrowMoUS8gKznukOWcn8eWMpakTXAhH2MQysIX9CS7lxaoeR8Fwtfdyh9ntetBehhmpNFxk28gqvxElPILv6KmVmNai3GbhkbF/WSWycWeGIsAxM7Cd4mQDN2x03bEIBz+spd1f3FXoclPZ0hvNGYMzrPw7Dcm+peVLmUeKNMJkepENkldBKZE13FQKJh1IN7938/qvKH67feVbrEhJ4nTJkOwAAO8kDxeIyWktquuYp0dWFBUm08OlamQ/VpDOIe9DT91qPiZrBXAS1xj+AC0J6Vw+nbzt2uSCTRhc98YZFlLwJKbaHNVbTrZW8ZdEGg6CH/8WLZHX4g36bj1el2XA27lcd4B/KnBVw0VYXNbuawfARnf6Zx+jrifXEkbL5HDCTLcXIMh5f08XR7XtGI1cOfDXC0w+3m5UYK4riBhEcNkRKpXp21afluLjq9mzwRTjYC1eRJwlxk8adOdpCyFtY+dRpZREkgvDX75ofTm80H7dDHVqqJzGzKhqMKA173HGu0osuJZ8b9oChNYuYIdksNW02/UzT3WcWK7197lOzMoqp0o+Vj6SMAu6WK3y3up2wHNta8PdnEJ8AoO0nkgsESFg4Sjpr18omz6ybyKNnkiIOf6bUaBPea8n/77atOOogaORRYxOJt9hCX9vo+D0rbxm6iWReeaCfjATgtQxdzCdIyMDIzACYZPNpd2yx1qd6LCJyfpxNjJipNcUUdVSaXxz2ZmeMhPxz2L7FIIUZdUd0GGvaWPSBID5j//oF3hCtb2IbKUIfr88NXHZBZe8XYXwASGvNdCPT5vQJDE3dwMLDCvjvdc72gDdTBYSOrThVFqO7OTSOBANs7yib8dXFaHO6Q9s92Y5ppTRpIqyEpP5CNw687JyWoD7VZB24USIEvC3lmX74qqUlTw96dFviZ/XX9PrIIjIK1KiyoNvxVe1V9HdqKQVBiSqQ0n5NpvRpMd5NIZtLrzJ4wpyqUkpUVF2qFVYmtIlpYOVykyyps1oxV2KZCrYu+6g/ZXqwYCsMOzKj/2nibqLTiQThOojx/feEmot9up50KxKfs59lE9eEsw6++x7295rZ4po6lIFsS+xIla8ZPOA3svOtu2vDju7amd7Qv/iMaGXSxE4nY7bO+Ak= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: e9490086-6f13-497d-25e3-08dac9da203d X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Nov 2022 02:59:50.9621 (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: DU2P250MB0127 Subject: [FFmpeg-devel] [PATCH 3/7] avcodec/flashsvenc: Remove unused buffer 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: PMOJT5gMOeTd Signed-off-by: Andreas Rheinhardt --- libavcodec/flashsvenc.c | 9 --------- 1 file changed, 9 deletions(-) diff --git a/libavcodec/flashsvenc.c b/libavcodec/flashsvenc.c index 9d065bb92d..0618b2aa1b 100644 --- a/libavcodec/flashsvenc.c +++ b/libavcodec/flashsvenc.c @@ -60,7 +60,6 @@ typedef struct FlashSVContext { uint8_t *previous_frame; int image_width, image_height; int block_width, block_height; - uint8_t *encbuffer; int block_size; int last_key_frame; uint8_t tmpblock[3 * 256 * 256]; @@ -91,7 +90,6 @@ static av_cold int flashsv_encode_end(AVCodecContext *avctx) { FlashSVContext *s = avctx->priv_data; - av_freep(&s->encbuffer); av_freep(&s->previous_frame); return 0; @@ -114,13 +112,6 @@ static av_cold int flashsv_encode_init(AVCodecContext *avctx) s->image_width = avctx->width; s->image_height = avctx->height; - s->encbuffer = av_mallocz(s->image_width * s->image_height * 3); - - if (!s->encbuffer) { - av_log(avctx, AV_LOG_ERROR, "Memory allocation failed.\n"); - return AVERROR(ENOMEM); - } - return 0; } From patchwork Sat Nov 19 02:59: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: 39337 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp773214pzb; Fri, 18 Nov 2022 19:00:10 -0800 (PST) X-Google-Smtp-Source: AA0mqf4vNR62DrPxh0VE7/tX37Jeoe5LqDhVrbEv7QvnpE3T+HVfdGlbdsC+rjYzIwdlvuX5HNaw X-Received: by 2002:a17:906:d977:b0:7ad:934e:b67f with SMTP id rp23-20020a170906d97700b007ad934eb67fmr8017331ejb.238.1668826810471; Fri, 18 Nov 2022 19:00:10 -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 a26-20020a50ff1a000000b00461dca37cd0si3991131edu.126.2022.11.18.19.00.10; Fri, 18 Nov 2022 19:00:10 -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=Th1LLGTQ; 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 1F88E68BBAE; Sat, 19 Nov 2022 05:00:04 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05olkn2057.outbound.protection.outlook.com [40.92.89.57]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4FD9B68BAF5 for ; Sat, 19 Nov 2022 04:59:57 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=RMExXvDV+tfAk/kr3cGd9lyhaTmNAywlXhF2Y4nA8Gr7ar5b1YURrvrid/UkAKzAOrIEegTV1PhpvB+ErlDds91fmiIG2dHkIdfzLionGD18LHC5/0lxyVLsaT0bHn+IXLa78mz03JEG4d1H1DAyzUuuI+oJUuNF0FtmZg3BPxqxLPmTD3mcL5pebiMXJ12nYCTHOUODfzhaqv8ag1FKHBxxP69ZBGxdhAStPs/RUyGdo/Z6S6ueN8WGJv5NdFZ1hOHJG1wn8zGYZTWtjgUYVeiWgmkn1V6V0QdbusiPD1nXX72BT6je3xk/lHYYBvUa2I6Xhqs5QcUWUNd3K7Dy7g== 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=LM5YkAFoMNu094BdTiJmR7A8tcOi4p/BIP8dtWXew4g=; b=fvpR+nlyaesVvI0LdsPrx9lKPXYNkvOqx0SYy9m4AZFi1LLaGTMAPIvjyv1c79yJD65ulCLdiFPGQLo4lfrNsE1ksSZQ8n0HO2AQMe3h0qdWUWARIXvqjkbUSRyMzluZiS1urXhSjtg7BImqFndpLX9KQ2wjdMtW/RFKna0oGdqGw0Hli3qDcpjRDKSo0yOEa4hteCAO4rBHU0skNRGch8ZdFVtkb/Ysp5bVFZoJg6KAWQWIct6fZ32ZtfygEkR1rfN1s1YALjq8TPOcXVk0qU9wn2/s4KF205SgDpBX6iHPSH9ExGRGMPWxrVAwk8FdjTxdcoBwByGOkVu3/mb7Mw== 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=LM5YkAFoMNu094BdTiJmR7A8tcOi4p/BIP8dtWXew4g=; b=Th1LLGTQ2RtBDFDNwneuhf0jGSMPZ4iuHm3Sq63rmUCPAPWUZLLZn9OCs2pL91hyLdTCRfudJ9NiNgfsyElZhEepbOhnUbzw0mb5b/ftmsDRBDzLg5snp/toGHca+8hWQons6+giVTpTvLUlOgXzihcBAqradT0HJ1usr6c+/o5bu/SEwBc/vyz2PipPyh8/e563MDaNk62HJyA7aVqoQ/FJ54Ip5wBXqlGNJMo8z7PGmXST7iue1rZL7OtR5YU1+9J9xGXi4ljud/LHsufG5VPckZJkE/nSPShdasoF02POZSoi1Uf6dxlorHSF+0m7Sdgw9qzrXASyQduUZI0pRw== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by DU2P250MB0127.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:270::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5834.9; Sat, 19 Nov 2022 02:59:51 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5188:7559:45ea:5f52]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5188:7559:45ea:5f52%5]) with mapi id 15.20.5813.018; Sat, 19 Nov 2022 02:59:51 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 19 Nov 2022 03:59:52 +0100 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [a+K2VAgiJCX1B1W+pO9YSLfOS1SrZ1xNScMlrOsotRw=] X-ClientProxiedBy: FR2P281CA0044.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:92::18) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20221119025955.1758795-3-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|DU2P250MB0127:EE_ X-MS-Office365-Filtering-Correlation-Id: 203262ae-65e0-439c-ea8a-08dac9da20d5 X-MS-Exchange-SLBlob-MailProps: AZnQBsB9XmpdHtR81+IA7gDwjaoMToLskMBkt3faGokyKMj/xs5NOkTcyiPGgLGG2nEMo1ScOdWG4eWavjFZ/c5B112+q2Reffo2Ngs6APFEw/jNkR1MTstPbllPBvXnsDbR9qJf2Z8IGUF2kr0K3JlCqtLKb/g9QVVsda1/7Ikf0CPNd5TCyP4nJca3SHVwDFnGfQ7sqnvtKaXc0+DUtoWBu0Ke5eux2it5odcgnj+SEdwZqd0epj0bLzyx+zcvn05pgMD5SQSLY5ThFHJhdXj5uqonDd4g+M3KHWsar5Y1vz+wtk8G9Hxeie6MiHtCtC+2f71Zp8VBORuwkQIQsfSaJtwvkCke6z2g6U/8D5mO94sVQ2C4MBWkeuc01kzMAg5LvjI17MNSw2z18QuPSGLBn619b2rAjHk+foPdldC9oIBlNjY+l5AFvGakAdxhR8WxkJPRmEuWNEcrifQLRQUEO7/hRhHd/4hb5bnIgRbz7galvOK3/+3cSKH2Vue+0Viol5SMxRrCZ5EixsyptHGmTxWTWajRSoE793Wa5rvjoij6JaFCoDLGrRKBDzKRYukFacs/uKbfmkLyr3j766meuNII+Eb0ZtzZm0niTCU8C9I0QgLvSFdfj400CmpfgN745dQ8Dz8u0PxNI76OhSetWxAjnEL+rAY1mC5Btwj9th+qLsyPuR6Nkr2bUXlpAwuLEjlnqFpV4MEz0UwyCzNe/4nmZ+jqptut+Cz1Y15nWX9LYbR5ZO0KSQrMImjneY9rg8cWo1M= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: EB2EnfKP+r9J7lHhE82YYiId0lUFORNZaanvTmsraO8STFDE5U+QogLEY/ve1G0rZOBy+SAQtlyeS/KzNUSGYFaa06uKTm6uHvZlGsobyA0bql4vA5g5IC2EYzdVyqQar/sT4s33zivQq51q8e+WO4DdNl/lcJGZ0el15GH7o3nMjVZF7+hDNqD2PUwN+loTh1Z+/z9P+OyYpYbg8gl5+x/J2h2T7lqQOkYD2FWK640aYTwIgyVd+CWCxwtUsFsI7DDEBGkA+c8E87GGpiRbQAawIBxedhIBl2BPhlABY5i7Kd3uIKLtZBcXLy7ttx1buXJ6WAR/7ym789rjBmsE4SbRpGBMgxTY1pJRmmibj/e7Pw1du0yf6d6In2jYsmv59SITCaBXrueCV0ENgp/99h1ytbXOTDEKG0w2oC1BCem7OlJL0HUNFtyVPVygpL1x1PXAhprohGgV6Lvd7S1qCkEnfXKYzHF7tRtbKBDj4dacCqf+U04hbevyfxgZ5omF5eBRkfAwmR48yKhR5pMvkDBE72+let2w5WbLs2PNz+ho+xbogHOYDTinGFyErcjARKV81aRinIwyolZD8DIVPtZ2W8PE2fFWYWjAbwieuJxjwBgZPCuj8v6b8hIUpfYOUFny8yfVO+WX/y80aDHFEA== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 1rzlFIhQ7hagrOSpe+nzAIvccQanoO8p50woKifBCfSHjR+ngAR8YKAFgCKZBGQ/5NYgFUWh6cAQq0aEqbb4SZVarMsPdQAz6l8XqmZ6pFN6Zk8CN1R52PLirNTWUA5C9LwZWJW8P2ka9/3WHRU5tgqZybxXOozhaVSuFBMQIYCM9vU/9WXzRv5a4SHLojkjZ+4GaLPGAphhqLqseOAl0683JvKTh64KzREUiCFo7iBAaGl+aY9hIYqLFiUzNWop3nF1zC+odBAvH7e8cvr+JN2ZKxYtzLftdGq4tYoVdjIj3wgsKvJoUNUEJ/rXxDxhXthQgALgiAcH5aqSmjKwfZPifiNWH79+wzHtm5h2ZPopgDWBwVuuHwGFdikm/uZ+nkTZPDNYq1hasgLxWcSBXUIG2r/FGy4/vLviy/u+nM9q5+22u2hBc//zTCnvkwsFDuzXvwAYSgwray1caPtRHrghLfynBOjPjMWCp5JNYYAL7ocGJPPImq1FtpJ/8yeuVOIUTFc3RwUgeAcIxgNa9FDI6CE8aF7INz6PLO4GoSfrCIrBWzxbe26ft0b6MI9PL7+2qETSS+dTfGLCXKUs8RwYN9O9+mIWcnuRxg9teN9/1WF5N4x6efSmkkeYzr8xxMlPtsEMM3vOboi/V1eQpEQE/zP5t5Jr3NzERt2fKkMN70ZPA1zUALFWcjiCRjk7VrcmuTn/DASmlLd/U0tPfe6mUB3tuSv+eeVjJV+GIXL5DUDwrFT2ycJ6JSYQoR52/DQfUuQ61WLVlZtXpcNifTFHCas4aym66j323o1+WrMek0zi/LTcWon+WcJgIjvhRSgE3O0Zzrpow/UQee4s8sEEArff+IG2pIGIbPbk1X9tF/HuquwPhp2sBDK4+N313LISQ1YLKFLVzndjGJ5G44Tz0mELKsUNhIF7DnnmkY1BwqS1nyjI2r5vWorbiTqx8dqnI8XHjDmMN+YU7vACy/2m4/mqyhkGMrWloNQAO0SEjEEF5H1O+9NCzWSyjYLJTg9dUMOwKNSBhNx0MgehNVSzGnprEFF29tGKCQe6NmnijPN3Y/ftG2f2DwgdoDIhB0+a818Vwc6UNyniDwrlV6liSjh/9L6dG2zynXfPVGh+7FG6/btlcPsj4l1a9NpRPFgUvHkqN9AtQEfDA86s0eWcQlMX6pv2vc9UE3hBnAp4cPXmnlC2m1V7P3kgIJFR/KBJj0HG8zDdR0pz1m15f9WpT8Htv1Xk1jEqMyMLZt45aYqEeoP4qYBQJkaok72qNa/Q0ASe+buEI3N9Bnc34E81gawlO+NVFKH5PdJ2f+Q= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 203262ae-65e0-439c-ea8a-08dac9da20d5 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Nov 2022 02:59:51.8852 (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: DU2P250MB0127 Subject: [FFmpeg-devel] [PATCH 4/7] avcodec/flashsvenc: Use const where appropriate 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: xHwpPfzuUpc6 Signed-off-by: Andreas Rheinhardt --- libavcodec/flashsvenc.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/libavcodec/flashsvenc.c b/libavcodec/flashsvenc.c index 0618b2aa1b..18dfde0e24 100644 --- a/libavcodec/flashsvenc.c +++ b/libavcodec/flashsvenc.c @@ -66,15 +66,14 @@ typedef struct FlashSVContext { } FlashSVContext; static int copy_region_enc(const uint8_t *sptr, uint8_t *dptr, int dx, int dy, - int h, int w, int stride, uint8_t *pfptr) + int h, int w, int stride, const uint8_t *pfptr) { int i, j; - uint8_t *npfptr; int diff = 0; for (i = dx + h; i > dx; i--) { const uint8_t *nsptr = sptr + i * stride + dy * 3; - npfptr = pfptr + i * stride + dy * 3; + const uint8_t *npfptr = pfptr + i * stride + dy * 3; for (j = 0; j < w * 3; j++) { diff |= npfptr[j] ^ nsptr[j]; dptr[j] = nsptr[j]; @@ -118,7 +117,7 @@ static av_cold int flashsv_encode_init(AVCodecContext *avctx) static int encode_bitstream(FlashSVContext *s, const AVFrame *p, uint8_t *buf, int buf_size, int block_width, int block_height, - uint8_t *previous_frame, int *I_frame) + const uint8_t *previous_frame, int *I_frame) { PutBitContext pb; @@ -194,7 +193,7 @@ static int flashsv_encode_frame(AVCodecContext *avctx, AVPacket *pkt, { FlashSVContext * const s = avctx->priv_data; const AVFrame * const p = pict; - uint8_t *pfptr; + const uint8_t *pfptr; int res; int I_frame = 0; int opt_w = 4, opt_h = 4; From patchwork Sat Nov 19 02:59:53 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 39338 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp773293pzb; Fri, 18 Nov 2022 19:00:19 -0800 (PST) X-Google-Smtp-Source: AA0mqf4JTlZkDZfPL5UBSaTWx/fyT82kFSW89h+H6L/oN9TTOr8wnX7v1GYhQHhJj67T/YPRu6ML X-Received: by 2002:a17:906:597:b0:7a8:fd1a:c073 with SMTP id 23-20020a170906059700b007a8fd1ac073mr140828ejn.4.1668826819261; Fri, 18 Nov 2022 19:00:19 -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 q17-20020a056402249100b00468d5d7d4afsi4129287eda.440.2022.11.18.19.00.18; Fri, 18 Nov 2022 19:00:19 -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=bxhoqxP5; 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 3368B68BBBF; Sat, 19 Nov 2022 05:00:09 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05olkn2057.outbound.protection.outlook.com [40.92.89.57]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6E18768BBE3 for ; Sat, 19 Nov 2022 05:00:02 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=fzvlQPTcgyxbAY5IBxjEeyPcoP0WNlxtCFQFSVyBckHUKx/uKOqnqe777M9IhmjdvIuWCEB1wPm44g36GpcgJ8gJwflRhbBp4XiZ9RSS6oCPredUlap4FLGm7jA3vqNFp1nnm4yredmgXkRLo2rR39x0hjL6JKLzI2H0yWjm4gMKJ7ZkzADUXQCR+srDbfDb5m6pooIsIKdz4fbxT9A9RkLvAAg1blHsB17h5fpjz0cRDvMCCA1QyeaCJIN1J6TjAdYZP8fbgwBsJ7I5I9HxOdnyP1Qa6NLP3iqG5FcBkI8+9zfPk2BsoXoGYdIczNjpTSDzzRqdoROKMXk2G5n0vA== 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=3hkLOpP6Dosvy5yHQLnSecKdvxUS5p6a3WtYwgeFMj8=; b=l0QnVXyNaxltfUSSPxW73p8ZQQp9OQnXxLKnJ4p1X8DeLng5kM6Jt9/soCZ1FtAkXAGZwpauTa9JDaVDPcWqOOLCUReI07s1Tc7SHCuVzWqiGUG4nzMJnwiqRRfvI0lFHxPckyByPSMwbA1ws9+mb7DpiB7imbSoxbKGb9r2AL09LwMjKrhmWAHbRj3fc/q4rMEjqWx7T6cCk1PJLpejjMStPKEHPeSEJQkIXwGrWgycozZDUfU+vfcvawcdsrgOSWHBhSYrqCrUkIBDl6YZKP1VzqMHB3S2k4XK6BbnYe9Zqwc6X+zU/NTa0htkchd+oHuoruORQKOG3NGSvXSv/A== 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=3hkLOpP6Dosvy5yHQLnSecKdvxUS5p6a3WtYwgeFMj8=; b=bxhoqxP5LvreB+NpPSmoceeZWOigKb8SXDkL/VxXk2JlCpqxYrRhSpaVDPgbSAi9yBgDOHv1njfSoAeIpIZ6CG7pwVYyUGesy+fHRREpNFINp29KntFEfc9rwUQV2xfrZEm+B7efuCoXiwTrnRjvmYMXQLwlcQ97z4mCpx0YO90I4mzTXagVbaFieowRbQhfcTlsoAU3aBFFPZLkrXHGTqlv2teFLM1+Zn6bPvr7UWaJDuCX9kNm7LE9G4GLMDg9m/h2vwQrtBoxiIeXt/45tr9/S/glL2FXiaNJf72gbqpqWtqvI1x9VBrzIorFIv326FB4B6APXjKmXgPRHq4A7w== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by DU2P250MB0127.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:270::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5834.9; Sat, 19 Nov 2022 02:59:52 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5188:7559:45ea:5f52]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5188:7559:45ea:5f52%5]) with mapi id 15.20.5813.018; Sat, 19 Nov 2022 02:59:52 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 19 Nov 2022 03:59:53 +0100 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [KygkbPV1uku9qE/h3anUhk+sBKyxDGQmcF6femb0fCE=] X-ClientProxiedBy: FR2P281CA0044.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:92::18) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20221119025955.1758795-4-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|DU2P250MB0127:EE_ X-MS-Office365-Filtering-Correlation-Id: 88124dfa-72e4-411d-37e3-08dac9da2159 X-MS-Exchange-SLBlob-MailProps: EgT5Wr3QDKzQ+EiUC8SRy4slEJiQUIdMI0E9737jnnKWQEaEcUKBgMucpzRJMQUV5xtyQ8LvyT3m9IzIBPpBdH4XOp0jSNfZEGpeIpazT8v5RG5SuGzikhb6x7O5vHbaLTeuwJRLKeYK5VrhZ6dR3cmD726tNvIOCrOE2tllYs/s8YrEh7MubmyV5C8EvwsQUHgYdVfjGFyFIbcLqgjT4he562hchETPQiTOC/bgFmLwalY6phGKdS9jK9lFH8D2WcBu8G1JzINmlq4AbH5gDdSSJFYn4088sQqQ2i7Qx1ROdA2qv+PNT6ip+6VJsBfifAmYGzEIviLr1mn29qh58tHA7Q5SpDERLw+Dn4aez2P4LsaDk4sYQA+Gz8hYqHGICso86ujozzvT5oNayj5FALsQnOu1opd2AcoXxFnbQDq09Q4JyxOLhsn3KUzwxycrwW+0IIz4Fkk+oXCLLSKkB7RDUepnxvP5b7/1DyFK2axWwpHUMvP1NODzwLNmEhYX4PsypeRM3ZTYE4mJoO/NaaSy5ft5unj4hGebJrnFEfBUl2ZveOe3F6ULyYIfqakzNMDkXObcPF+0slgFaJhQTXkzNaSgTX+ksne9lXrWF/Kru/W1WjpQwwcyIJar6xRiHz3ir/35ZiYLC/enO9HQCwZZdKqsZLU4JCo1tkOCG5yh393zAPiWkP2SH2dDZQp3FW8ZxGdVhKknUIfBeH31Rhs5BTsayy3ogQrXKrH1Sx8= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: AqWZdIdng8aJxcGGCJ+JrVep04dUekgQ5eoIIFAHsoaV2hm6aZ0rGTHFd16rWz9CCZ1CIV8p4/eD2hv3QQp3lne/mAGSSVcUPdM89TjHc92fZEB5eotpuFxLpIMWjUuU0l1N+W1FcPgmIPVpLc1BALy3S54kRYezhsfNaoe6aYy9xpwT8mEsC/teSXJI/i3u2E29aatXVOCbvYHgJyP61doSD7cjlEGGw2GYYntuotk+SG3LJ31A+E39QQpUV2A7NAaoOPxmrebCHE9NLFsBJeQloGeg1pCiixuWrWwkps0pS4M1Q2KeyRs4LyCYDdisgv/Xn36xTYWHObPfmWSGLIAIupiLhb05tjXB9o4Oj8gpqs7q6ZiU1+C955pp+4K25K+4nXJY7dU7p3MS1rIs46wKAU5/3ccftZfNZFsROGxjOnnsskDmrCj+x/On0dLkzDkzYdPfk9Q+p+gXrGT+lScgtuF2pcJF5VcaC/AO9lVMduvHc3gtMCFmB/QlnRJ7WfdrCa4KIvMW8MhktUc4iq55Rw14zlSbtHbuMK7j8pVgxmREyuLrxCtOi6b+3OnNPh07OONPsNl6/n0OfOr2R6u9J0wVoLSXAcZoIm4Jx1A63ETKPvPJtEnRzFQ7DmDm8jg8pwdOqDR/ZSrAV5hkemQm+mwXZEew13hWa5rsLuU= X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: XPGtgEFjII8uX0YSk6nZhsZZAd61mARDdv7UqdFn0BGZ5AfihhWPVmyNSIZy6QsLbkpJiZxQwo0vw+3ZoMfiN2sEX1V+lC35X69VZ2UFVB1AegsHGE4NmpVJAlZthotFwcbHjJTyaU1y0eNwo3WXowPk+o/gJMvGqxzmnViNHoqnFsusWaPA2RkDKRulrTekJkeFJr+qqQHn1YWdOch+i6ZUUZ3ikwnCbEHUA1BB45MHj0l8Nnj8bdD5fpGh/mLE7a7kjyW2V2kgcVyoEDbUVzH3aXkmeOM4RNhjxQX8HE69og++tZiH1TRZq+GoeVBvNwPlICldzUlsfPLQNZj6zU+OhGTWwtSyr2cCAtO6vxLfuh5DKh8oQsU+Cxj2qnMIIvYZz+eRiTERkkN2H5XaPFa7lfLMJlN2WIR4qN2+anCZ24rVyBuDRHHu6R7pTjNOD6PX3+Y2HdB2+q6KmeHGFGeO0jz6IXsYpRSd3Ds5BTIRKEYY4MJjOE9UGBM47LfXp0dulsxh9dIQz7zH+Y5p+zUCTIXJ+RfKB+QPAqk0rToBx/LwPq+mrG7IfTVZPuATGTvTuI24L8g96qhKITdlcETxn1R19qkdwjhvcsFYZHlHucAZTvHxspvYuqOTo5s12fd15JNcfeIRcn+JwVpGSUzXXQya5PlpMFBv/S+z3km43o0djtWuwfDUuxjHKqkC4qJH4O94g+cLNUQgijUrGN4ymnfiC/yraT9PRlAonrTLG+t86IDymA8EtKoMXrgkewkDv0LXcX7qt3HPJ66cXHvlh6ah3E27Ym/ZZ7eo8uQgUXNVPS0GE7eTZfSYDhRXKU2Jlrly7LMLzc5c8T3Y+wjC8/aynsVj0/5jD+oMF9/sfMkHYT41jmEwTE7yuzRlQYT/3G7TqjZzhqmOU6m0l7JUv8YqJ93GORXs7f1O3PWjgEulyM3Q4+Aj4mFKoXqf4aPji7br9KsNXYojKPWWihSBJWHpSa6cXNlwD8EeF/dXGBM8308WEXvdSogcfQc51csuqx6QgfFDDFK5etjr/nJTafdUuN0IYTUIGzTYGuVW7/tRqndu6ZwAma3KdXcbhG9Vslk/ZmAqZWbteAFX/UJJwOsNv+s4ZNVGhu0zSEVPJcZmu98ukAllI1TzVO09W66PxQnF29PZ6zw8uxnbZ7NusEfllAbQs4mEG3Gc5XveDCm4FMKaQlkT268dK0t5Gz2qJbC6F8Vkq6tD+kX9AslMIlaDaweLKVSAlD/+ZNl/03Htfnmlwy5rM2pACF1wRgdYjiot/LPBvyBazbO52Q41QRMcKxpPdHct8mO42t/Q77DbN6WNFju51TXIsxlK X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 88124dfa-72e4-411d-37e3-08dac9da2159 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Nov 2022 02:59:52.8238 (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: DU2P250MB0127 Subject: [FFmpeg-devel] [PATCH 5/7] avcodec/flashsvenc: Change check for first 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: HsYimMN0tVi/ AVCodecContext.frame_number is actually only incremented in case encoding was successfull; if e.g. the ff_alloc_packet() below fails, it won't be incremented and therefore it is possible for the previous_frame buffer to be allocated for multiple first frames, leaking every one except the last. So check for whether there already is a previous frame instead. Signed-off-by: Andreas Rheinhardt --- libavcodec/flashsvenc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/flashsvenc.c b/libavcodec/flashsvenc.c index 18dfde0e24..f42ef73b37 100644 --- a/libavcodec/flashsvenc.c +++ b/libavcodec/flashsvenc.c @@ -199,7 +199,7 @@ static int flashsv_encode_frame(AVCodecContext *avctx, AVPacket *pkt, int opt_w = 4, opt_h = 4; /* First frame needs to be a keyframe */ - if (avctx->frame_number == 0) { + if (!s->previous_frame) { s->previous_frame = av_mallocz(FFABS(p->linesize[0]) * s->image_height); if (!s->previous_frame) { av_log(avctx, AV_LOG_ERROR, "Memory allocation failed.\n"); From patchwork Sat Nov 19 02:59:54 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 39339 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp773386pzb; Fri, 18 Nov 2022 19:00:28 -0800 (PST) X-Google-Smtp-Source: AA0mqf4M366RYmifQRdR6QXqgwjV6LJ7ABdYz4l3i0HZwFVolJkXEWNJ5UUki9nNU0c3km0pS2Ac X-Received: by 2002:a17:906:a113:b0:7b2:7c9a:1849 with SMTP id t19-20020a170906a11300b007b27c9a1849mr8121152ejy.733.1668826828252; Fri, 18 Nov 2022 19:00:28 -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 dd17-20020a1709069b9100b0078d93325645si4541702ejc.405.2022.11.18.19.00.27; Fri, 18 Nov 2022 19:00:28 -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="pZl/V1Ze"; 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 2849C68BC2D; Sat, 19 Nov 2022 05:00:10 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05olkn2057.outbound.protection.outlook.com [40.92.89.57]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9A67468BBE3 for ; Sat, 19 Nov 2022 05:00:07 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ThqUS3dwbxmW4TQM8W++Mgf80EGeQpRLk3XZUDHA/A1ReIppeLFu0X40EIzZc7TbPeds6Ow+twKTGkbL6rSjBQAj3a4sdqiJUZHgkJKEpugiwTPWpvtz+ZKmssPtIHxonvm7/N8XcBgrqW6acBgXSSZlctw2mcgxzikSBafeQuMqYc+5c25SFWZrjDkwwtXtdzcTwHO5q1Xvgt9e8Q+f8TifWQKP4C8/59Ng6cN/hx0NgN8sBg8wIRnrQX0cVH0xRsww6UjE8eaCGG+/fRpTBfixWcY+JAQQ9Dw0XABs28Wq1XhwDSSS10I2kgyNq0iCD7SRptdAKFNwcB0bpVJnSQ== 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=MIXn+qJNpjmY6WYXOthocVLlmFznM1y1fBtqP+OG2DA=; b=g8kgk2MxArJ7PNatv7VP9H6cbgc91rlcayZJwNDnwf1pQOFho6uJbHB6lK2B/rKTueEfk6U1dwu8tWyBxouqiWcA46TV1iA8z1Km1aHpw4rUxnubTRWzBht+hJp1LjRYfhl2ZgOr+VaIraJZTaTOxngIkSsQp1EEsUVpqUtPpJWl8o3RVG4wjCFh5Jcifn7CorCvi4qxKnj/Kd3eCQAb0XuOk0WIYIdIhIll1dxsNr960qiHDFO7t0oiQyWn00YbIRTmyEVlma716Gvkymtkw+zOrw2l3M3yNB8LCQAeur824ah8yRA6YLO/et75jpcuxgogF8Hnq0fliI5nPzPLbQ== 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=MIXn+qJNpjmY6WYXOthocVLlmFznM1y1fBtqP+OG2DA=; b=pZl/V1ZeaDvn/n5FJSUBPzudI26KqQ7iOOrFgQjAeREyGie8qLKCnVhhzH8g5kra1ieXHk1UVSA/nmmiGl5RSqoHnMrbfo3853/8MoB3W5kfJtv2wMH8VYWOm+idUxaYa5ZT3DyGsAcwmHusUxb/0lN/fHFUELz0EC6cbjyTxcbbXGzbvQcRTzhORdgRy2B6EqSu7zUsi/ganRbGVNbDm9hpLyKZ4gMYNjlBLjQK4BIYIUdBNDpY1eb7qFlEmLSHiKE3SlmVReZYfOC4ZNyF3QfgOhe9yqUIi3ssLko+19jVyKHMijoub05vMWX519PHqv2BWIgIyFykgUy14kJ8jw== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by DU2P250MB0127.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:270::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5834.9; Sat, 19 Nov 2022 02:59:53 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5188:7559:45ea:5f52]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5188:7559:45ea:5f52%5]) with mapi id 15.20.5813.018; Sat, 19 Nov 2022 02:59:53 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 19 Nov 2022 03:59:54 +0100 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [+A9i+1HvohepB9wGoovjYEN9SbsWPQBVU4ILnnvB4pE=] X-ClientProxiedBy: FR2P281CA0044.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:92::18) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20221119025955.1758795-5-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|DU2P250MB0127:EE_ X-MS-Office365-Filtering-Correlation-Id: be369ffa-8a86-4757-50d4-08dac9da21dc X-MS-Exchange-SLBlob-MailProps: EgT5Wr3QDKzQ+EiUC8SRy4slEJiQUIdM0XCSjL6oTNrhKLxclXxawG86UjDc10MtcXYJheNXeiXo1V2CRjYjXshrsceEZO8I7rLNbQwiV4ltOxe9+ajNXuV5GKMxBZE4ajVTSIwghbEXWBUc0ERsVvZF/8YbQXWmTJdZjSAll/m4ckpNStrn7QJ9qGJoQLndwcjqTvsLkN5wYkZstdvgun+O+4KQ00HVP/J6KmG4gaD+A7pgQtD3Rpj2fX/xmIx8OMkmaj+Io9Ob+/xctvzbDUKgCwF0orMKs0CMtfzut7JvGKXENehf1l8giyOUYTAi8QQt6UAamZoB22Msg7ABnCwYPF3SG4JztD8kdjJEYvgp1njxeoAV2PpDrFT6n0PA85lH25yQWtsFs6V7mNBdZiH8y30gsIVss3nWy+rfGrX1gWHflmUf8GaHiuobdjs6c00iLvrqkNI8bwsowVGgB3a8FLpooK1mhyhsN5db99gSOsxmq6zmsQRlRTdj7ZuOlXmYSNoCqxu1ZhTXtTpZdjetcqbnmmYmQPGPJROJwVYRoGETbWHV99aE4n89YPsjUzreVTvH144Wn/r9AQXkPw22m+FrOqwhGaWYw/Fnqg1MIfCDCHBXDIi2gk1YKHrfGSZHXd4XGNfuNpv39ez54t/CdO6kiUyaNNNWTSB83KEcDaHeGgXR3hcUGQEDr8RC9l/wz8gbYATJz+oyf8gc6Qa9QRQdKpEv87Y3Hzp0Eic= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: PscsH+ylJn+2Yu98IhxJhD/QBOUTQ7v5gzkJtBxPoaC/23pdPD1zXKUtxej9eq6A0supcDbXfD7uksb+ODY2KG/TfHkX2oy+ooLRkQwGDGOkh94n7Wu/hy76YnzOSwj+xgGO/YWfP+3j6kTyy7PA9T7Y035mzA0U+boUmhBimO2zo/0NJ/wefnsTo0SEFjY9c5/Tpfw6JRACEEHYIWo6OZYUpW5NBXF1BvAbOaMccPPG2578GuDj2MbznW7TzWNhvgq891CRKtCWkA4KEiStXW/0adHsBo4Do42J5roQTv7guqKcD/ou+7nnXdzJTuS8prBRC67HKhDetErns3M1jKKKWXqeFmaiONVUptKLYZGnGKwiPL+yfwxiD7F3r8yL/iluIOxoB2FO14xrp8anw+eTblV9Vx6lfhX9DDUPOP9sqe61ZLZjcjekx8oerruQRc+XKWhzemxFl6WGYyA7UvWJFn5W6rUxTwzOvm/JPkRmFxamw7WULYqXosIIgeMSMu1S+spr5BpFG/t/Y8KbOiJ8Zk5yMfuqMehW0WIQql0NWPgqbsBbKBHGvBHI1Wm3h9MNqTLfnaUV4vgJi/iXVWY4qlesm6GkHEAEhSyFFqvFQYYOuvwwxTXQCB9eXr8bX2lldMMniY8F3fcZy10a3Zxchwbs9O7++pOSakCJiMo= X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: FOThdQ0kb9HIVu42vrTpjMBTupyNcHOLwpWwRmMVtL6rxycWa42RUAw1YqSKM54ry5dJ94uLG3AvXA78XrIXEV9Ar2RTuf4KgwTS6g7iuBJhWoQ1kdTMLguIGtnIaSNMl5YlKcrduUa8SVrAv314KR4gH3LGMHLb+cwYwBFPQnBZbX4xwXUZSCVL1xhOXVujjOZYZNiD1sO+fb0t7jAXYVUjqBY847FvULrRLDcgEdVQ5GYt09KxDN+p6XQ1S/PHy9/S8RfZ2UKpSpUlEsXyOkfwCu+c5APJDMX/qAmV1LU7DmeIoLSAFRy2n3BhbSh24fTbtoinH+xUlKeUipTRR1a2uZ1GQRd7GMRkWBTIDRw1vubWGiSrDKQvHrmctGrt3HVekOKQl4BnJKvrJBb2PCBYOp7lrzyn81atHEW26cSkvOoMuYoHgTE/S0l7TEKiTRPQlHiTRcCGo6RKdoe54T2jFiKSKYGcU6J4FjisLt0pfBIPQBRrVU5RqHuLmmTAjHIWMxkl6NeDV5HbbpDJEWi5t7rNdMXZOj1Eu8hli/UyUvLA8EDpD7meaSaNZpsREL/8NQe0Pm3Dx/ZSa17F0NfIDXo6lUHy/SJC8qCNiruCH19Rh+LOO+J1WZseeRcx5U74SgQ00dfgjyC0x9KuGhh9AJ2ukJNJ77u+ny5DcVpianguTRPMRgU7VJOFWWgnZb8tIT0FZGA0TP4qy8sSZh2knh4qyGn72SO7jOuRg/8Vc797/jZLUZkQhfdp6r7OAUHXgtoMCxohguMcH1UxIjsqLXQqpJWg9hXAHdspXUCf0x/VoJa22q5u0l6S9n0nRj9CSRtaY5woErL8HTBkzA4nb+kRXyabK4hd4e9HEFF7cXCvfgEArXo05ExOmIAfp0ko7QAJL1KvWobBzM7eeaL0Vv9VqAo+URKtFdBs0bcIb+5sT4Lsaih8VPA9Jrj/USkUx+SPCTuNcoxzjXX9JOtUuNru7+Vpz2XaYGUE44jYd99AkmumX+5p0zwLhpBd7wDBrKttpMMOlKGccM61e9cWiUd+tu9znx9fW9TAm9WHaLUSAW6O+S2cIzITPw8er980nVg4vGAR9OFkzYrgma17wHEYmzqK2rrx+YyTsXa8HtA6iHyuB+mZBOJjrYbzb0cx6gITGJ1sOWfMelsCl0uHm1ccUIIrgKIxQbZ5lrpHhlDd5EulkFT/I8e0AwTQJwowULnZTkyiHuQrLXPUhR/GDtcuqmL8wj+cnBpQ7yCfkA7fo6Kg7fbR6wUsr3dH6H2omEI1VpyaUBz2+gTzjmxqQ7WdBBb6Oi1O6gt9usHyIURvKOKC1Ucw3Hdxcy+q X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: be369ffa-8a86-4757-50d4-08dac9da21dc X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Nov 2022 02:59:53.6361 (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: DU2P250MB0127 Subject: [FFmpeg-devel] [PATCH 6/7] avcodec/flashsvenc: Avoid copying 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: JoBxZygr/tyQ Signed-off-by: Andreas Rheinhardt --- libavcodec/flashsvenc.c | 36 +++++++++++++++--------------------- 1 file changed, 15 insertions(+), 21 deletions(-) diff --git a/libavcodec/flashsvenc.c b/libavcodec/flashsvenc.c index f42ef73b37..3c3d9c8813 100644 --- a/libavcodec/flashsvenc.c +++ b/libavcodec/flashsvenc.c @@ -48,6 +48,8 @@ #include #include +#include "libavutil/buffer.h" + #include "avcodec.h" #include "codec_internal.h" #include "encode.h" @@ -58,6 +60,7 @@ typedef struct FlashSVContext { AVCodecContext *avctx; uint8_t *previous_frame; + AVBufferRef *prev_frame_buf; int image_width, image_height; int block_width, block_height; int block_size; @@ -89,7 +92,7 @@ static av_cold int flashsv_encode_end(AVCodecContext *avctx) { FlashSVContext *s = avctx->priv_data; - av_freep(&s->previous_frame); + av_buffer_unref(&s->prev_frame_buf); return 0; } @@ -193,26 +196,19 @@ static int flashsv_encode_frame(AVCodecContext *avctx, AVPacket *pkt, { FlashSVContext * const s = avctx->priv_data; const AVFrame * const p = pict; - const uint8_t *pfptr; int res; int I_frame = 0; int opt_w = 4, opt_h = 4; /* First frame needs to be a keyframe */ - if (!s->previous_frame) { - s->previous_frame = av_mallocz(FFABS(p->linesize[0]) * s->image_height); - if (!s->previous_frame) { - av_log(avctx, AV_LOG_ERROR, "Memory allocation failed.\n"); + if (!s->prev_frame_buf) { + s->prev_frame_buf = av_buffer_ref(pict->buf[0]); + if (!s->prev_frame_buf) return AVERROR(ENOMEM); - } + s->previous_frame = pict->data[0]; I_frame = 1; } - if (p->linesize[0] < 0) - pfptr = s->previous_frame - (s->image_height - 1) * p->linesize[0]; - else - pfptr = s->previous_frame; - /* Check the placement of keyframes */ if (avctx->gop_size > 0 && avctx->frame_number >= s->last_key_frame + avctx->gop_size) { @@ -224,15 +220,7 @@ static int flashsv_encode_frame(AVCodecContext *avctx, AVPacket *pkt, return res; pkt->size = encode_bitstream(s, p, pkt->data, pkt->size, opt_w * 16, opt_h * 16, - pfptr, &I_frame); - - //save the current frame - if (p->linesize[0] > 0) - memcpy(s->previous_frame, p->data[0], s->image_height * p->linesize[0]); - else - memcpy(s->previous_frame, - p->data[0] + p->linesize[0] * (s->image_height - 1), - s->image_height * FFABS(p->linesize[0])); + s->previous_frame, &I_frame); //mark the frame type so the muxer can mux it correctly if (I_frame) { @@ -244,6 +232,12 @@ static int flashsv_encode_frame(AVCodecContext *avctx, AVPacket *pkt, pkt->flags |= AV_PKT_FLAG_KEY; *got_packet = 1; + //save the current frame + res = av_buffer_replace(&s->prev_frame_buf, pict->buf[0]); + if (res < 0) + return res; + s->previous_frame = pict->data[0]; + return 0; } From patchwork Sat Nov 19 02:59:55 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 39340 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp773467pzb; Fri, 18 Nov 2022 19:00:37 -0800 (PST) X-Google-Smtp-Source: AA0mqf5qPQtN2j4zIXrdhTO4DeI/d48TUvj6dW7MRiM/Hizxy7uIFBaRD7JyB9cvepDuhwkuumAv X-Received: by 2002:a17:906:a2d9:b0:7ad:d250:b8fb with SMTP id by25-20020a170906a2d900b007add250b8fbmr7877904ejb.739.1668826836917; Fri, 18 Nov 2022 19:00:36 -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 q1-20020a056402248100b0046178c62b6asi4438793eda.477.2022.11.18.19.00.36; Fri, 18 Nov 2022 19:00:36 -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=a5XLQhw+; 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 2AD8268BC72; Sat, 19 Nov 2022 05:00:11 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05olkn2057.outbound.protection.outlook.com [40.92.89.57]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B805768BBF2 for ; Sat, 19 Nov 2022 05:00:07 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=FNkxdtqd3x0qRoi369P/u1LKfP6XwPqUDpRDDPxRK2Ev3qHcTcEZOKI59GPKXXZgk3KgzUB97HVwdfpxJREgaGBcatdeiD0UQIVt4LBcxis/OgsONodWkshp/ls71nTUAmOgPuKJ0LxLSIjU2DSMwIOUVCizn2INPPAizIyB0tTR3KGzvTv+hBKw/v9DsUJlmIGdS0m/yHzhvO19pWaptu17m64mRFdpB9TFr/uYKpHJfY+m56hU+226NTsS4FNiIw0j8awldsM/VqOOfCF/SZToVKHSTvIJ6vt+i0b6lz7ZMyR9cpbHoKrX5u6GQ2pvXEz/zmXY3metQLuRiOkUsQ== 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=zpazKE0RPKJ2lndk2LmyJgNPriQDTC2olpzjuLTi4Nk=; b=PLTvMAE+14fD7qloMo9tlBK+1fbxHqYpFJ9wOntLybhcm3SLVWebBN/vV5gAv2bS6TYywa3ZdDvBpB/4OX5HYofH0cHtLV+OfwMJEBXQQu++V+BA4QL1LMVdqCRGcwUxfhhF/phPYRjGydQbLHJNEswQ2HbKaCh6LCgXFMfdzRfGFs4gpFrhBjmA24dtzSKSFGU8Qo9lgiw5oZet+e8vtLYImiVQqIP41a/yPKX+b0S4AozOuscUjTGHEvsgsbizxfP5n6uzmpVYAFRnEX//AeHZsWAUEtJASHoA4nJgkrnO2sMDneiS6phx1h3J6yb0ie47FGZKQVIfjK1qjdjPXg== 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=zpazKE0RPKJ2lndk2LmyJgNPriQDTC2olpzjuLTi4Nk=; b=a5XLQhw+n+IUWmzPdlvZwxaUnSqBpksBa1qarGFAk0eunIVtEXHDCg9Xol9jwZaf31sOPRdL1tnePpepo4qvxY09UfVWof5Yu94jYg4e/BPEXwFRgtXN6jDwbVHOFk4QkMIwZJtVHmhXIEWmyp7a3t2/hFJUy4f/kDjruADTG+VyrjSajQ5X52nTygD/VqDbIcpuNNOewEz8B2E+OQF3qAnf4emSHEhYt7Fj2HDV3wEytRRdKdMLZfH2I6ud6h103CknyHHOm5UbdExAeMx9gNE6//7LP3iBeGr5mpzbHrGhOU2UKpXYdo9p1abVV+JlCewN7tQl9eHjAfFXf4F7Vg== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by DU2P250MB0127.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:270::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5834.9; Sat, 19 Nov 2022 02:59:54 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5188:7559:45ea:5f52]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5188:7559:45ea:5f52%5]) with mapi id 15.20.5813.018; Sat, 19 Nov 2022 02:59:54 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 19 Nov 2022 03:59:55 +0100 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [L6J4wYHAkZbg0QXjfz/lcA+goOUFwHFkGwAKBR3ZxFA=] X-ClientProxiedBy: FR2P281CA0044.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:92::18) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20221119025955.1758795-6-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|DU2P250MB0127:EE_ X-MS-Office365-Filtering-Correlation-Id: c1b12a1c-b998-4f66-192b-08dac9da2269 X-MS-Exchange-SLBlob-MailProps: AZnQBsB9XmpdHtR81+IA7gDwjaoMToLszBr1DrbImXaPrGqfX6KjTkDVPG5pa78KSpDq54SJluyBf5H0p0lXPNzd2/sbdTwJLYvDju9w9JSA2Eo0eTKCQpbFMK60GC+rLIoLp62vWoLX/EzPceLx0Wx1gsSH/Uhb43uUHbYlPvkwPTwq3mrdaSopF29fxCxWJGeEOAkiuB5K2UsZs9O2yeDiF7icm881nakIs545oHpeU0oG+IzLCH6oWarZBIdQdQcdgD1Sg9GK8O1lSjGG9kaXtVkpux7GY8vGEd5OogDzDQn6tIxTFLvCS75Y8ZWh7WyCsejIocstsaAh9HAGc7vpBfSG2or7cKceDpTgwcHOLtcDawAjMXUQkESfpyXTqE48112PfbNn96ZiCUgCd+Vf1VC1jkL8dttZZ3/kbgbDKgiibsTth7gvk4FSSjTG6nPAiPvDqFhIoELLguRb9wHlkQNnPit+iyRTFv/559SkzZv94k/6oy2UBQL8d22sVCdRqb5E3/oMBkRHrMs/COA39IzMbgksiGRG5wME2CFYkWPcm6fYdWeTt+YMd4iw9vQLLZHHS27Dxd+txn+6r1qAB0vEM5mw2I2S0aVpdMI2mPLbaV/KnLp45RxboGPcO1J8kfpArV1HVcsEG3N+FZgihOxOrc0am61YXKm7L8BJ/VM72vUiacqsNtbBrzt5+0vS67ARbgxE7CZjKZSbM75TtuP3y+QYOomDwPNSJOoxjKE/5r6dm9BnE7JCDso3DojFiF+SIoY= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 0LI6lT5XfDgT6OwQMt72yEdysD+oM0JVkjuNUKEJN6AVnE2Q7QIYXwrZdZyOOsni0cra6E1OA00wcEiAXDUgosXV6D7VU+VRMx83LhsX1gQONuAPZfN2EeYPUc4UVFV4sIfgnH//LdBBq/HWVVg/kGGEFDWsmymAf34+ncwnSh05M6RNu7YTDGz7q1dlN8TI1DhGCt9fSwC6l3IEWrT6RLcUMZsGGJ5RoqHzWCI2L2bbrDcFF17a4A9c5XOe5CdSkr+wza5MOXkHiHlc/wedIhnoeR0SGTn22a7WnKmaAaLYUdQ35Ze1nXQe/pQqVv9kxXkxpTyVe7vrU2wzsJzHCnd7m/Row68OsEl9t80jDHD+M33XoeVdI75C3WiHqN3AnV2s1tmSUsdkY6ZKcxSRQI3zYaH/JjsQ3rWPDGeNqReKCcwrTT6orLIviEyoKAnUTG0j4eFgobSIWoqFBosi5mb2KUilJZiMz7+JUH0LGEXYmmziFBDNvW0kuk+JawjmKz8zVjOBqLaSNlpp84UW59r8NkD7tXr7eY15e62/PZc9Rzq7YBHmv/cqFv8B9TNTvRME45ggnqYycKCY4/P+UffCJKLSs3qRlK+DX/jJVoPuv3In3aoFYBVUkdzTLYHwV7XZbuzcWahpmbrAXAvvCDhVPZivy+dmqNhlv6ZMFc4= X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: sX245oQYyw1SSBjesE7tHFy1MdbNDYZQZXPumXoch2xSplDjDZLeHyjT3etNr2PuLNA/NfJ6q5oAKM2wnx0unvbgk/lN0CC2r8WCk0d5I1MRX/HfV1Z28AuX8IA57yKJppX5DJ3/9gAHIOvcWErkJa6vhoaTBFbfa/aeIJ2Mx3vFR/iRmjdUocXsNR0UcjyqYZAJp2Yw2fcjO763NcIY4YHAmyrACvhCP0RpIe4STAORKTPDh4rFAzMYvEnyCZtIDfL5NqPWAyVs8KxSdLAzldesW9dSamuf+QIJRQZo/6R+gKb/u05+3nC6FIFesQx4leeuYRPcAOx8hHp/S9ZsqDSWTS1s2UDkqlm2NIhl80YTCOWVB3dWirCo5ZeYNltpRMkphYG4ghA4jGcX9X3agOwu3XRvENQ2TbKIcQw5j2gf/ETEEshnZ3vMDA0OE5l2qR+J+Gsuc33LoKNF6BiKT4LFzVLermtEoi7HFm2arFEmsCsphZlsehtJodK8m+IdowKIP0JanH8y6GniWAWpmHZZI/UA9svEpN/chN4fNApIOgZ5aFYz0tkANQOHYDuaWCMdwRNCdErI1imuxrGl8qYF35Agoh92IgNKqGoVXbhsteOJeENuu7H73EnD4MYODxB6T0kRpimo35TWdkuSpp0bETHmtjieVBLgnBCd6EK8ruHHgSNT5M8mm/UihclJfnAZ4MeQqYy7KWtAZuo7AUbfCCo/bdILIk4T613tQmdvrRQhoMPNgtUrmTyxNoZzchZDi4eJmT/mHHNrhUvMFMmWCqwOmqhNcDmr0MNU4DTQc8ivxkwDIYRAWdHXUkr19hQ4pKdNdB6VDH8HtYDddTuLA9evcB/ICNQrPZhX5JYaCpZI9OzrDytjjkB7XdYN9dqh0UASLzQf4IX+47WNG7pWcCV90EC3IGTppDQ0Ph8m33mDqR6d7Ejg+qWRL+6nAHv0RHg6/oFBKtsqJAe5o43ytevsXuhY14J2wwKiP1utbokmCyY1/orh6QFkdB7PoPwIrZX2C0Y1KhjQ5lxINT3Fogif4vn0gUqVJWCBvMX5A3tfqkJu1Lzi6QOxsQ7rF5MD6EI426KJMfKc1SINPpoazbrgt0vQSJM1cd7RZtX52MDV4lnE9H7s7nujVK2eja+sIQ15S4d9wHj4PBWBYFzHHYKNUjmN1CFM5WLS6NBgUuxDloQZab4lLER88MwHPwa+mftiv/4MAlTYEbquuxJHjxQixehKkxdLz+Y0cKS+r9ZGqX/nXZjl7CkQcTaY5D1iXkEYZPEz8s7wzZiNph8B2d4MvmA+AYZ0un+A//LYZMjfTwfPMDEUaLXULd+6 X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: c1b12a1c-b998-4f66-192b-08dac9da2269 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Nov 2022 02:59:54.5744 (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: DU2P250MB0127 Subject: [FFmpeg-devel] [PATCH 7/7] avcodec/flashsvenc: Avoid unnecessary variable 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: 8ubW18B1Q088 Signed-off-by: Andreas Rheinhardt --- libavcodec/flashsvenc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/flashsvenc.c b/libavcodec/flashsvenc.c index 3c3d9c8813..89119733df 100644 --- a/libavcodec/flashsvenc.c +++ b/libavcodec/flashsvenc.c @@ -195,7 +195,6 @@ static int flashsv_encode_frame(AVCodecContext *avctx, AVPacket *pkt, const AVFrame *pict, int *got_packet) { FlashSVContext * const s = avctx->priv_data; - const AVFrame * const p = pict; int res; int I_frame = 0; int opt_w = 4, opt_h = 4; @@ -219,7 +218,8 @@ static int flashsv_encode_frame(AVCodecContext *avctx, AVPacket *pkt, if (res < 0) return res; - pkt->size = encode_bitstream(s, p, pkt->data, pkt->size, opt_w * 16, opt_h * 16, + pkt->size = encode_bitstream(s, pict, pkt->data, pkt->size, + opt_w * 16, opt_h * 16, s->previous_frame, &I_frame); //mark the frame type so the muxer can mux it correctly