From patchwork Mon Oct 11 15:36:49 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 31061 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2084:0:0:0:0 with SMTP id a4csp3822773ioa; Mon, 11 Oct 2021 08:38:35 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz05H0yhhu6ZwuUpgJifZA1C08PYMRfUvkAhaUJk7no7h+6k4t8wsSXRqI++LwF3mhioX05 X-Received: by 2002:a05:6402:42c8:: with SMTP id i8mr39137738edc.349.1633966715153; Mon, 11 Oct 2021 08:38:35 -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 z16si16269221edm.21.2021.10.11.08.38.34; Mon, 11 Oct 2021 08:38:35 -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=NCBrJJjR; 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 794CB68A953; Mon, 11 Oct 2021 18:37:23 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2075.outbound.protection.outlook.com [40.92.91.75]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AC99668A8FD for ; Mon, 11 Oct 2021 18:37:17 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Mdl2uLUoOyrLNzkEOHkQYI/OM+1FaYh+XLSnGFlLAN0DntvAxKge0DVxhJvEsRG+zg9yufALiE3Ut9DA4EnnmEBInZxsMEJPVptEVnMqAEOuV7e0H1tvrBTaa+djraELmfpogdLOOYRxvkyjZ2oLlYdkYt6hRFCj8a33Lmv63P4BnHUTci1C9D+ULD5JZGsk1xij5LMB4tg4kzS9apEnSxjeYrfE0xZcFDZ0qk3gEjktaV5X08WQnQGE4xnDWKwewvzpOIRhGHTl62T39p1GcrL6iabG/dd4e3WsRcjK0gcf+hM11mwTNq09Rq86XzWQvKfEre9+gW/txZKvbjZG5Q== 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=fnP94bvuXiJOPP9x8dyjcuSOgUw1LtwYmnJ4lfMiRJU=; b=lT9R3leGsi/Wq2B5ZeDTUVv0bA4By1lymNdGOlpm8yP/G6vu1wnbrv9UFHeZYP1SMyB79eG57fJ4ITw0CEIlG/qHNFgA3tIKLxT2x8kjDcbY7fwVHugHK8yGNf7xIsVXFyxsbkGRWOlzAwHxnLYo552O8khwNwy6hkn+fAiM+SxYr8f4JGabAES014Qq6jB7szsAEi0jdw/N3cC0BB/pTe7Q7bW2TVkMejGLwJcFy6I1B2pB8H4FxSCkdY9Ut96oj3h81E5d1EGiOrN4/thlmzRJBZTe2wS03Kt7SGRjiHv6uBTI9pvqex5WawnVwlV8r9eyqFolqjKNxYV/2+SIWQ== 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=fnP94bvuXiJOPP9x8dyjcuSOgUw1LtwYmnJ4lfMiRJU=; b=NCBrJJjR2Fo+6ijHhApaBcYD+IaZYZUhzXqSOfFjMBp3kvb2Iq3E01f6RQobuY/+99/XxaVIFo+J/lW3Voppl8Hv7QbrVqpBjH6WbeP7DVq2q5VPHVOsW5OFRtoPmZcfFArq5bC6EnCnj2fY5LBkwZof+0MgyT1xp/WB1qgrY2jBuhBoS/O45ibzXGPItBgZ0wWurGE4Mm1U2CaGHPPZrBe5N9ZJTZq0mOf9Yam+VGJa9hybrTlgDq1Tolp9zK0AxGDO9/R1PM9NVgkpmOoYTmB1UZhRPJHAuoPalKLDkVK21h36tbfIceRGMyh1CCVKJb22XBm9WBt9taJ0eMmglw== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB5046.eurprd03.prod.outlook.com (2603:10a6:20b:88::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4587.22; Mon, 11 Oct 2021 15:37:05 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::700f:d70b:3bb8:4d51]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::700f:d70b:3bb8:4d51%9]) with mapi id 15.20.4587.026; Mon, 11 Oct 2021 15:37:05 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 11 Oct 2021 17:36:49 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [L3Z5kgVXQduqfK8IGcc3KVnfi21ehv+L] X-ClientProxiedBy: AM5PR0601CA0070.eurprd06.prod.outlook.com (2603:10a6:206::35) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20211011153649.1961025-9-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.193.170.49) by AM5PR0601CA0070.eurprd06.prod.outlook.com (2603:10a6:206::35) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4587.18 via Frontend Transport; Mon, 11 Oct 2021 15:37:05 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 666b6a91-756c-4763-c1cf-08d98cccfaa9 X-MS-Exchange-SLBlob-MailProps: q+fD6XS3/UI6aq+TSwF5kAc6nHpsvHHu5izXn1bFfiBps/RwsKQnVHuk7bOj2cUAuAt1dQhneZ/MhmeKIHbtMKgLiQ9hNNMriYLGakluGlZPNKV+I8sTt3C9jzoivC8wL+cb433MGI4KXQ+b9SFHinvI/bO8bmmNtO1CW+r1lM4nWb4XKeKJnTbxHObqUgE8D3Nxqh3PAwq8ktxM/SJkhxq7O90k81Wuxa21oPwFT84tXtBGdbyaZzyUiLx0GIU6abE7iJ/0qWkMcaYFbAW+IDnAy6jB2m3ulfsVYjHHszaBpPsYVhd1i1Xw9FUWAZp8qn9VkDPs2NhFvzMkesCdCjSWs2gyMMuWY5RgH4ByoWl5DRzywwUOeS/CsRW9FH7aBFDHC7eNWaJO0YmGKJefbw36vttZLECVnoge0HsfeJG+Gv6o5i+TifPmOLT3gzDdIw/Z1oTqcQapzJ+WB61J6tOh90PHsHdb8Ogk9CcdE2DzOHNlz5zx8KM4l6VrKxfUxJd5mm9XdmASReRAw+CXfecL00hUKbKQlz898WLjDlFbKeNav29QTYhqIacJtdXzPVDs7mIppa99Eam3yOdsYXCQ3nxUYxHV3UeKpmLVKY5czTFKvSCSwKK1T9PCsSgjYD0Nwxmxkz5WLjTUWk40dX7EU7Oo9m7lETY7DVkfraqzmekrcyzKdkaV3xz/awQd5WK/CXU1xASIUxi+xHZEpg== X-MS-TrafficTypeDiagnostic: AM6PR03MB5046: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: AdW9CV6zHmiXATnKjV1RojX52evEdNAAZzfdIeYDrMgEzVs1fiDP6xGov3Nw+tZIN4ODeHsiQEdRBRKKwyg6WfcIb+vCRYfyY4rhIO52Ul/y0GEylfM9TRm24i5nW6TxEKwVZMjuEM6NivyJtdveMxenLGbDmH22Z5sh9ZPA0KpgBfWuOiJmsQGA8G5WqQkjlWc4H6FvSa47h0xC7W9YV5W2X2kwGQ9TGaAxj4A5D4hACNy6SCnCnalUdyP5oHAyImzIfUFAp8XQ2z5ZEKIXUlmAwYd1us6GTk+p+JTQUGiawlKr7tbCuMMMw85WdjF47oXGEtP+6qfyLbYufmPb0iKNxgQlEsd8vX/F/P2PV2bJuTIy5A8SrIePsx+brnbgbVUkMupiWAQ0q9fnAgZjBrL9+uPEmPCrZi0/Bn9JjMEE8bkdYyxYdsbBscqBUu0E X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: S/dRlYfSYdT5aEtkrg37zTvlTE0NllWCfG/+YAgRMmT0GiDdbRd0V1iQJ5vsHNmwZnwm6nl2tSwJkhWMtXcqQXG+gqkTIThzabtpUPrahvULR9pA2GvMe8s5npcL0sn65Klw9qgQ6utpivZtRpuarg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 666b6a91-756c-4763-c1cf-08d98cccfaa9 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Oct 2021 15:37:05.8293 (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: AM6PR03MB5046 Subject: [FFmpeg-devel] [PATCH 10/10] avcodec/mjpegdec: Use AVCodecInternal.in_pkt for buffer packet 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: bny+mYkKpUhP Signed-off-by: Andreas Rheinhardt --- libavcodec/mjpegdec.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c index 7f89641660..8b154ce0ab 100644 --- a/libavcodec/mjpegdec.c +++ b/libavcodec/mjpegdec.c @@ -127,9 +127,7 @@ av_cold int ff_mjpeg_decode_init(AVCodecContext *avctx) s->picture_ptr = s->picture; } - s->pkt = av_packet_alloc(); - if (!s->pkt) - return AVERROR(ENOMEM); + s->pkt = avctx->internal->in_pkt; s->avctx = avctx; ff_blockdsp_init(&s->bdsp, avctx); @@ -2960,8 +2958,6 @@ av_cold int ff_mjpeg_decode_end(AVCodecContext *avctx) } else if (s->picture_ptr) av_frame_unref(s->picture_ptr); - av_packet_free(&s->pkt); - av_frame_free(&s->smv_frame); av_freep(&s->buffer);