From patchwork Fri Sep 8 14:07:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 43667 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4e27:b0:149:dfde:5c0a with SMTP id gk39csp502684pzb; Fri, 8 Sep 2023 07:07:09 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGiqbn0g3zE3qGd59xN96jwJBB5leCUgCIZ51juCcb+Hbx5hTKq+VrlcxIL3I9gRPsINFtg X-Received: by 2002:a2e:9c1a:0:b0:2bc:ba71:ddf2 with SMTP id s26-20020a2e9c1a000000b002bcba71ddf2mr1994790lji.15.1694182028844; Fri, 08 Sep 2023 07:07:08 -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 le19-20020a170906ae1300b0099bbf89772bsi1396662ejb.757.2023.09.08.07.07.08; Fri, 08 Sep 2023 07:07:08 -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=gP5w96Ft; 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 1578B68C884; Fri, 8 Sep 2023 17:06:39 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04olkn2058.outbound.protection.outlook.com [40.92.73.58]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 75FD068C78A for ; Fri, 8 Sep 2023 17:06:30 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=CMGf4tDMNqsy4Re0tS5ph2vF3RwkWdZo/k+lzaC+yLWFBxdAK9fTMhdtK8Gf0xazhTtD4dR7m4hvuy3wrrfI/USc6strNwOK1hk9ZS7BVpga2RA1qlS50bP/SFnSfTAHwpXWz72LJ0UNbufRyXeIdn3f6cmLflypgIb+lF2r+7hEWvgYpe+b4F8mEbBZFZaQVhJUimiDYvymXjbXtgyHS2G/LqjX8a97gqJ2Mx4eWKkZfhqZxzINC/clINInZ7zzKeF1A7juUy/oGOqmd7gp6Km9ktg2EyU+LhWNEwlFcfGg+2UyDl94v1voLXNp5PQ2TAnvrpuv1vAYWciOouL/Ng== 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=nTokUCG/B3a+pu6xfI9XP5g3j9LrxPzRCmUr9rImUC0=; b=KnRYA1B/mgezfSk7PqIlV8mE0IR5ajnRMG/adyFWZ/KwibmyO2mqbQXSB/xLWxfMM+7hf34mv335PnHWO1pwOhqXi7DznTzjI45klQANHPRcbDUBYDQkkeF5vwA3XS89ViWb5drJjVQafY6jzx57fF+9wbg4kv1I9QpEWYGMenkBu53/kWahPIphfToNq6XTnHaIp7GHiX51rwi+FKL5l+D4fu6v+MXi/9wfTmldBtTYUrcsJgjnQRTBpvHHG16wV2+DHJsxX/YhTBiszqPJS8b+91wJlU5/8kz7Q1a0BqzXcgER5LpoUhuqvwP5nVyNOFvCqLGPpEqank8QzCK01A== 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=nTokUCG/B3a+pu6xfI9XP5g3j9LrxPzRCmUr9rImUC0=; b=gP5w96FtOFfnxdXrHpmtbRgm3QAay392LzcA3UCSPNXBNZdJugLcnt0LO3101IC8xsvsrPBKEVxdhq0HFj5gpIEjy7bOkCvFmC7fCUMO1+DTXbMiAilmXnLVEtbE+5Ezh2t7dIjieWmfSiPKQ+fn8kUK73d2Ugb6PN13ksXVkLP5shWrgEyKi4wzycHl5cLcsbAPVEyqbvl/OyukDFLyPKhuEaUN7phhqKG2FzpS1G2ESthsv/ne+s+YPSoS49KgAPqQu4UosbpLkCrQSbdQwET+Egd8YbZgGsVAdAXLfLlcAhT4ysGuBo5EkVmXPQSsil8ulb21vxbKiAbfFAc2nw== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by AM8P250MB0198.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:325::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6745.36; Fri, 8 Sep 2023 14:06:29 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa%3]) with mapi id 15.20.6768.029; Fri, 8 Sep 2023 14:06:29 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 8 Sep 2023 16:07:27 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [JkcwGAmns34vuSlDiFAn3suIv01Skc7E] X-ClientProxiedBy: ZR2P278CA0069.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:52::15) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20230908140727.2150730-6-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|AM8P250MB0198:EE_ X-MS-Office365-Filtering-Correlation-Id: 6471446b-6577-4e06-6ce4-08dbb074cbfe X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: KXCKcV8qb2xm8x4jpovzEvGhjqR7J5sdSr/YsKyQCKrWOZsHOJtUug0loAx8urBPNpnc4VTJt3uUwlUAqLs0LEX7Jo70Por494yR6XRtMb1B/X7g22ULXTW1pf8DWrRE7RX572bPGrXxdO0YFJPaT+tr0yx+kZJF5gcGJXB59LBz2FXjpoglHYeiliD862SnWzDa0vKdxvASZWYCiBPwv6DBpQ3K5nhHffQHlwaPM1hMZJ12phJYGZOACyrrd9YcHiiuFg8KsyWGJBIawjj/MsCVuHoX8LdKu6ttlzDPb2i9kEUncUyj2o6oDUPRpsVifryA9MQur8dDnvUwy5MdLSElmdkqkSvs6Wqu9EfUyg+LMfP04UcBCrgYeLI5JNPy+HUnl7Gkfc9U10w8k6AdIrU683qBUP4YoGBMYHVOT3NvM3QNFY6ILsmQg+rUT9uqyTK96ubczoeRBAqj662daAPyAHnajfFvcbw7wpdFF16/luFcSVJa2RYVCFpFkqDOWZUdVYlvxnA4Jnf6X9CrAQaga3luWwtH0uVGopgPeGUqvtVjdd1FIhrGberHH+DeTk8QII4KbJt74SGigIpOqzibR1gHe/70SoLcvKvpoQfyBM8AKhw8sPlvycyqolr0 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: I8aQ0TC7+fFxXIp1QyXjVqSHdXmTiP+SbG68DcaeAKaKaxGcZcYSpwjNkgL4sqjNXyV74tfPglOdAQ0jf7yLJPfyaV2QI3BR3pSDswRP2E2dHaMfA+w45V8SZSbg+S2zeomyiCLeqIDrgIEzvO1mB95xldr7W0eaSokduvlQ7zpyEAzQ76dbOD0xlG8WXYY3nbUuWk+3sIsp1isRkKq3VobIN62B3S5art5KdV+IVrxodxpVZW7DiVsLqUs5Bcrvm2e5ME75JD7lFICqY1SkQd6TexDa6rDy6jrx72wwRXJBnNa5fW4sexLcceKMQub+uYQh7JBZ4VrMsiuoiW79vpIpNg+/Ea1byEilL5kNq99SBCH2byYEJ96PqmcFw+yzivF95128k5v1cFSMP2xjr06ZxJrOuWVO/8vHFPPVYSwr4BMDEMhtuJcyk8a71pgkEvk7MfXWMLY0QPauvPPsEdxJI3xfa1TBXZdunFLjO2lsg+Pu1E0WMzHWGi6vthUhTlqn0vU2ZcpJFsyby49J/ZVn4QmDRhI01Dh8SS7HNVs9IyVLnuJuqggUHx+bwagp0/ocV2KyRC87291MgVAPGg8mNLnODkL4GzPQHZAWWIRM2MkBZLHyvRZsbZX7Ohv3Vkfuqal+8T7gIPtEvivUkuJ8UJRSKzvwHwSlAXU3o5Yja36tbcuh/KXhB1cQtxqBbI5rFw2VtRt4hURWo1evZV0cJrk8b2PW43dPhZKCGs4JlbWWLwubKaAyJnl1W8UMDOZkBsenHmTwsmVwWRS4J0qPSX8pAnxxrzZ0ciTrHCqdRSvyVw99Py1F72rejlqBNUKtxraaOXn+IZCN/7b34dWeMcdJga1MKeW+ruD8Et2isgyEhUJ4qP3AciROkmEUb05snKfQ/tIFjgnNWNsBXrAssP8/xETaaLAUMJUMd7fQRwCXTfYwr5btbNc9A2jj9BJVe+vVkULMH3Mx/JZoOuqfEc0weR1rGG6vChyP/JkKZHXQSGgSOWQsxzcLOAutkXwhn0yJ/Ehmhk4K2Cf8FjsP4DXEdQnrAeiXezCxwUKFYtj8vwxGiyTS9sw9StyFmOkM/4TkDkUCa1dA3AhopOMBHrHEQjG/vtQDfCodepYFeTNzi+ejnqPX6YPs2xJu0H0aBgjAuR9rVZMl2W9D58VvMaY0gkZqMzZ7tZp1Q6PGKe4BbL2qoARFxex9MahV/Uxx/zbzCC5EmHfjLcde3xQNQb7NyrbQlOkCjkUwU3uG8MnKFYUfCeriT97wpbxv X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6471446b-6577-4e06-6ce4-08dbb074cbfe X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Sep 2023 14:06:29.1851 (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: AM8P250MB0198 Subject: [FFmpeg-devel] [PATCH 7/7] avcodec/truemotion2: Don't check before freeing VLC 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: ntUvSWa7M3CD ff_vlc_free() is of course compatible with freeing a blank VLC. Signed-off-by: Andreas Rheinhardt --- libavcodec/truemotion2.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libavcodec/truemotion2.c b/libavcodec/truemotion2.c index 5527fed958..366d8aefc1 100644 --- a/libavcodec/truemotion2.c +++ b/libavcodec/truemotion2.c @@ -222,8 +222,7 @@ out: static void tm2_free_codes(TM2Codes *code) { av_free(code->recode); - if (code->vlc.table) - ff_vlc_free(&code->vlc); + ff_vlc_free(&code->vlc); } static inline int tm2_get_token(GetBitContext *gb, TM2Codes *code)