From patchwork Fri Dec 24 03:23:27 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 32891 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp7811596iog; Thu, 23 Dec 2021 19:24:02 -0800 (PST) X-Google-Smtp-Source: ABdhPJxBG8NRxxvCv4DF8gaLsXujSee7YmTMwBc/9J3+VQLU+7o9yNw/sctlHZ1VOIYXD4Jorq2m X-Received: by 2002:a17:907:3e9b:: with SMTP id hs27mr4036899ejc.590.1640316242398; Thu, 23 Dec 2021 19:24: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 r29si3084951edb.507.2021.12.23.19.24.01; Thu, 23 Dec 2021 19:24: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=fIKxpOcv; 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 ECF1F68B23A; Fri, 24 Dec 2021 05:23:57 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-oln040092075050.outbound.protection.outlook.com [40.92.75.50]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0107168B22A for ; Fri, 24 Dec 2021 05:23:51 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=feDVpi2H55nSRYWgShmZ76G9fxeM0ZmqHNDF/mg12BlmPLGSRbygt+BGSdAu3bvRPpnmX7Me72Xm6M1msvCiQy+42jrU5DWdopaGQd9EnR1xt+shuan4bkWFXAumWds+FsDQ4+vYUQ/17iRiodv0vyKy1+IFeH7ZsX28WPLquwrz3Au/xCbK0k98+LQ5Ab5D1AYvmM19/BzKndGjTZlkvxnzQx1k4YlnVo/sVyGs75ORND/xtonaDrW5tRor4Sx03ZJhuQ3D2hqggb2fttU+aPM4wtzwOSccujzr76YCN5urnSNXAOYea+H5SJ9pUhtj6KghWWYP+TJPg2S0gtzLbg== 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=uPhkwtrPHWFhoqZWL2FcuXbCR/Z1fKYmNds5y0RubVQ=; b=JiGS2taZ9mV+e/PCTslf3trXKpL060Rf7ZD/ot1IKO8Q8Boo7Tho5iuJfVENI+OSMZYtJlyULjrk1NiemFdF2Lia9LPq9PawbbjfYx0/jukAlkTNkLWHO/LTEG/B0xXgclQNMcN8zCq6cflFHJvZ/6OQ2eus08OmR5FntKmFEMmOV29dwvdnljk31d9JUpmbjexIMN76iHvOuKJVaWZ9tb6K5ZYFx3kbW6U7r6ITVK+jSzSaH6JqjTmJuyU9DjjoWsko11vfYeQxmewa/96EWeGBU+ZZXj7JDB/TH7yYlNvfiTmzd0UnqoByYnNXwmz3XxihbFudJcod7l0lD8aOfw== 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=uPhkwtrPHWFhoqZWL2FcuXbCR/Z1fKYmNds5y0RubVQ=; b=fIKxpOcvLYA7bnwadBYyZKMVcIb+si50mbzMH3oxTTn5YGdtstnFAAbfUHElZXAouuxRo5NrIMll4vyVpbCR/HEEHHdUf/HvBbZaK1aW4GI71CGX5EO/FWpwvRTPDx5f+jkfDRNDRFeQCX/KhTbrZHshNp95ntssSfQWLb7ZKSOfcptm/dn15U7c5i+Jk/qzq0HLysBnIPLy6JJOfvBN/sdjuYw7WFVX1SpRR57MLe94DFJtDfQnLwgFn0kVRUhS4ZU07TAMEJOoewGuwcs0jjOjt81kWwJVbjfALAfiRsCfKwJ/iz+9OQKqP5NatYTyMFHiEqD+I1vRQfCZpZWW9g== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB5249.eurprd03.prod.outlook.com (2603:10a6:20b:c9::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4823.18; Fri, 24 Dec 2021 03:23:50 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::f0dc:92f5:6bc2:45ca]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::f0dc:92f5:6bc2:45ca%5]) with mapi id 15.20.4823.019; Fri, 24 Dec 2021 03:23:50 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 24 Dec 2021 04:23:27 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [+blPUERvPu9YZvj3y7gk+BK0S4o3wdaf] X-ClientProxiedBy: AS9PR0301CA0032.eurprd03.prod.outlook.com (2603:10a6:20b:469::30) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20211224032332.2104747-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 5511a6e5-cc0f-4d9b-9c72-08d9c68ccd9e X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiR3EehW4kxQzdNcP2D/mG1JMlIpjOXMRlkdkHTIRe0wcs2WwGn45Gi0W0zqnJBdIMhw/zlq+rIDQZBZwfbdhA6JSTd6QEw/VnxeuZosjOCuL8X5pI6zCy8+WmnG2qNIGBXI40tu0i7QAQ9gpNRcSIB4Du7SZ6o6jc11lGdJJczLE7TkSdx8rvSv7AU633q050eQw50TBVHAc1AIK5jltdbJUihdOiuTUR0jKwSANRSsjXjO8yyXCnSi2wlHkiTQvYQkQfnoinniJlIWPm7DTPCI1BSYTrxvYNsTs2I3ONibXIcFlOF7qSuMX+rUkRxZmgjDC9mffVx8H/5g5Gq0r3MyCGQie5MPRAfF+2Qy63efGtMWwlKpqI/z/mwonCSlkjYeZ3Efc94ye74NTs284ZYIptyeJo2v33ZMGK4Y/x23hWv3YjKEiQ9C4PsL62urSO71nny3au7F5hq+uX1ZpfoKuTD2pqZTLOnafNC8WptPcQFqMD3HWieV8u637iAHArabV5kMKqbhu8a8a86HnczEGNyL6vYojKpv1Y8nKdJlLnbxF97xXGfIUlB3eXvCO4Ycs0fbyEnP2MxHUrOf1RLFziXeyMTizBOrGCpuYHl/Rz06mQYun2sqTTKXl0HXl5v2IHgIg014XMz9SDu4ZWh0UVW0aly/f5NEtGf2py0EU+aX9P0zavKMxDgy4XxxC3dga/GmeSUITr4Cl+HegF0jwpoOJfCNbLsEn5o9JaohaKbSFCfEnsurEUk8GeKqXmw= X-MS-TrafficTypeDiagnostic: AM6PR03MB5249:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: gdVTmSAp9wstV30+SefeBBI82SUE+LuVVKpDwb+JA8CR9coBick2FRayuCKHZXVc46myQKUbMpxTu17oLnXLuyAmljFOb33YbjesjAbUBwiJC304QZ0CUNIUfcN0jz4WVyP8M2e5TmMD1wkPoH3tfoccmMiA+ITegjrEHMZy9MaJ9ZRx75Vuu2b/uS+rMw4V8MpQu/V65/ryD3U7rXp9MgKJyXOp4PZ7DIbk7Cf+HEFR1eqypKCCyWNXz7B+fOzrPmRZO5eupHdEVCPf4WTLv7ypasLe3IVZntDRSFo30WEvRvnUBq61aGoCRuWug4MhHiaB+BBEx8zpkhBp2xR6exDiHhjZsavAgrk8QVK1ww8PLqYah5L9VRHdidAnZaq4YgfwS7FSnLnhuQ9TShcz+S5t2E+/RUksrteWbY4DVGwsA22J1sYGFnYYEojLMierqgNAXknT17Ws3Tu8oMoBWaPHlD3+YJX4yDGmCxEbm+n88ZatVUogn7tXEqmOZtZEzy/9Zym79gtfQ83bcnKWlPIZ/3Lz5oilY/ZBLQX6YICmZHViDRJP9nHPGvYYTg1Im0WtGYzu3irD7PrlYbyiqQ== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: lUUW1Hgh9ZGzLG/2CrGyLpwQGQ8c159y7hPfro431Q54LxvsZebr592fXkQXsiUHwiHevYPcI/f842kGl81CroZ1lm/QAaEeUHXcURomRb3Apop6w36Fg53mVli985ViYqIhUD3AM+y+h0kCZhOaNhSk5jy5Bma5DAD7NG4ZIKzFameNXWU5tfc1xP2Xn80Upp5u/wtPM7ODK+qUrgREoDqtLws0hwiWIQE5F4P5D0WTMO2chZk3vabVZY2z7vaxgJ4ik724G/BqHGSvsh/baPVJBbquXucssonXToEte/NFx9TBhufgWaFJI5PZi81lJmZry1DdY8TvDr94gnHfQmPRX8i4PqOn3GjRNLxBD8DcInHIwDRcnspoaG7Na5JIi8dn8jlmjUePcuVgD5eKAGUT7vSn4OdNMXVu+Zd7FN+2pRCxRm/890deT9KaJI9wdwwGZDClF0Ym9IcTl4l0UHgYQ4UNQIsCuCEsh+hertM3knjLkqNQwGYb9oYU9noE4YnMoNTvi0wX402Co1k+YajTCp+5rhqJZCCRI8drVJdlEPS8Lw8/I1MI47gdm/YXICq48oYx4uFFOyLKlDgj4VyJtnEoIvaERO5BQA04zwbPfKZwfnc9jPle8J7vlFz2/3KS9kcee/wExUHmmxHDZM1WOKrHeKrKVGx3TBh5eH6Oyg/zgB5dvaRIo1Zv6R17rk2y+aFFU3qmZR4/oSgpQlmBIEF0Q2jeLOvMdC/0I53MJo5dZggtNRc4OlR16mtLzIXVFANv9px7kqiK2yxDdVDSEn+OvgFXW/TFxg61J4sWc10hG76RC6xM32dW0aeXjRtZquUyc4U47HFMFedrPe8nvdedBtxUmjV539G4Ssi/J5oLEMmTnLNaOBhcMkT8GJjoId3uAu3lhuXhe51WFtFlKEZQk2WsxlYcYGvUeo5fANczXbaJT0oIrcI0gN/b2hiezPvL3FWzIEFs5t/4yQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5511a6e5-cc0f-4d9b-9c72-08d9c68ccd9e X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Dec 2021 03:23:50.2092 (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: AM6PR03MB5249 Subject: [FFmpeg-devel] [PATCH 31/36] avcodec/mpegvideo: Don't initialize error resilience context for encoder 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: 2nAwKTRgd0QE It is only used for decoders. Signed-off-by: Andreas Rheinhardt --- libavcodec/mpegvideo.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index 8b16b4ec0b..c0ba91e864 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -835,7 +835,7 @@ static int init_context_frame(MpegEncContext *s) return AVERROR(ENOMEM); memset(s->mbintra_table, 1, mb_array_size); - return ff_mpeg_er_init(s); + return s->encoding ? 0 : ff_mpeg_er_init(s); } static void clear_context(MpegEncContext *s)