From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id DC76346B83 for ; Mon, 4 Sep 2023 11:27:42 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D994D68C7AD; Mon, 4 Sep 2023 14:27:40 +0300 (EEST) Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-ve1eur01olkn2062.outbound.protection.outlook.com [40.92.66.62]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 536E368C799 for ; Mon, 4 Sep 2023 14:27:34 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ezF0jZVV9/RWu/XkQJ480z0GoO0e6F6HvrfW55FyJmyCYXXoGVWb1L73DyxECbvbHVb6XLD3TDzjP8YYJSizG0iNPuqfKTlkDJnRmZbGUPgADGbkNIkV2ccbY7xhV++eVZl8rTxFz3KWPpXtokN+4g5T8CVAtLI8Ptl99cGN6wK/XOM6WfxQRXLZWBVGXaF+38CtpHfLmQRSdmI0Nf8s4XEvmVuabuGcwzuLlF21HF/C0njR1K+eXmvgvhd/kLW6KlgDqJsZWXsl8OaLowTEQ6ytqvqSZPXs2JxBr/HLhmP3DS/4PA1pC+o//N984GWZbyrN2ZH74sdG+ULJLb2tCw== 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=XGXsH0WG6LZ4CaewNUQxJ8cyo8qTuI4VTSGJcG7YJA4=; b=jMNfuvy+19Ao2/useJs9X9gSxSYu2wIyrxpH4F9u0koSnvQrv/dBTkEQfQDx75AVDmbDnQOlYgTdMV/PwXE9v9bd6u6FcPd/wrHbS7re7um73BVUNmawdcgdRVsY3bij2KolhyqDp8DjPUB/UaoJ59shxcoI/L+AbPxtG1Il2QL2BQKRNq46gCTbrCMvhTWmaMA/8iZaFSbrhxEMgwsOY57SuwcrVjXtI2p2Ku/YTvCwwmFguqURgermkUhQ/lvrHnkDHP9DWnpRp7e0lgCDake/LTcMC11nidp0R+EaEHoUIrSb81iDcOKvhledo1crJ4hOmO66FBvH3KxCUQMD7g== 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=XGXsH0WG6LZ4CaewNUQxJ8cyo8qTuI4VTSGJcG7YJA4=; b=i+6+UCQBMkK/kOq1rCpQWBAOGdAqlNhEbsCYtcBd8ef0X6EVJ/WIuohwVhB6NrDFmeDXmva/Pq9gWod87iz1nnp5bKd70ukdJdCXHGA4vMGzCiA8NLFVub7pN0LoKgEs04FqZFCiLpzNwt6DQc9iNHiWqLTAYNvVsrkIUmralTLKPGSX3f86kvo1F6vOYw3CefPY/2CYBowWKGklPMzz01tefKLpW7YBgGbg+HpwHDKvflGKYoVWbL568FIbsaYddmsHYuBFu4pekS8M4FknH26n/PI0PAzcU8PZyLiWIAjPmkdpGuz5KRor5Lb/XOJj9AExZW4NjR+cuc0lBG0nSQ== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by AM8P250MB0280.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:32b::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6745.32; Mon, 4 Sep 2023 11:27:33 +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.6745.030; Mon, 4 Sep 2023 11:27:33 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 4 Sep 2023 13:27:46 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [5LIbJBBvO8rs6DhENJpJkUQeNC382FgXiN+xHQ2noLU=] X-ClientProxiedBy: ZR2P278CA0078.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:65::13) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20230904112759.2652347-6-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|AM8P250MB0280:EE_ X-MS-Office365-Filtering-Correlation-Id: 36b67ca8-f326-430e-b5c4-08dbad39ee66 X-MS-Exchange-SLBlob-MailProps: 0wLWl8rLpvtlEyItUpZmgfjbRm+zWpoMWBINmV/pA5m2tHSi/fBVU+U2Z647kdqV9od/aMlSr9AJE9wpnwi5aqUBHhee07kP3nLsPHNww0FZcu15wiPimbwYQi2AnlVVFFms0URQVdXgrJt93t68wRa32L3pOhwZz4oZfSJTg1manGW2Sit4gReFZNIJ1lZzsSjkLy4QfYW0IDNWX4ZeZv7ukd73k5HU8rPpIkhK9KmhOUxoEAX0PDx6KPaFiBucx8EALgxEEseRrVYapMQoybV93f8FmIk2DRsAqgNeryEkPev4PJNyBEdbAHsaDRE4MCorynfzlwwCrIWshEEbNlReKfjK3e1ezUD5t8xDvaa7/oHkcdnVu52m+z58/2pdhQE18UTS9MqUEJsII5lVY5tdA8I2IIwMS/W9skh3O20mviMFEyhQV7rjlm2oHEsLPZCIxwApQZL+wdt9QGuaKCCmKp4+nk+gq/qQE/VlX5B830jMbbiQno1hz66+cJJGa2EEkvFODgCd2eCg/Ts6bWGwWgr/kfyEMwBhVvoDjL1TFKu0MAAQ3riuCirVvS9amTowHS1bUmhUb/31tXgDlduhsXdqrOhaGdlw16E+RcLgpaoAUBo5LqlPd9JWK/kEvUPsJ0DGG9ayBA/JDANfNP4EIgp6l2aLGX+FL4EYqxzJcq0WNZ0OKEgX7TPoKn8VSeOIslThFuSu5UvCto9DFfbvTAAZfd/nC3gWDhfW0jN/xtcNhk0shlX0H9ZitKR3xoDQM3WYYNU= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: r3xDDzG/HhTdTT4IKymU61kALMIP2VM1+L0SZQGJvyGvv/ojy6IUUCJpV9GEhw3fxHbx38NzGtFk1MCl7gWw2F8ZJgvFA8TTlblqONN07ka/K89nbB2pG2DbAJ59k8+LOaB6mgRSyApkSceqctbXK02WIbol7BDrj/rm8KSUmWcpHIkk0FfuJhf7aMMppKOcoxrySAnfPA3NDqnX+vImen7bbQ6KrCMofD0oaB3nlxpV2Tje2W/rYzDzXM4NIVugpHFoEsxiHe5CaDR6PW7LmJYC7hj+EetvQtVjmjMbzpclg8eF2T4X278R2/VrX3+VgkWukJhGeoPBb5zuOjl2Jwc3GBrW4g9WjbOEI9E/5rBzDJzoApjzoqRmdYPw++BAE/YccarA6pDFBhHtRG14o3VI73JUTzUJnI7rcQZx7FhagwQVdzDYWd4k3DaOEI82FaFaaF601jjV9VRW1Imyo0CT1c4D8GZkwheLdkAnQKLI3m0T7tVbfR1Xs9C9xIa7ZEPV7AOOexkiA5MNNhO+TCE1LVHIdJmXZmC5evOBjxzw53b4ZrIXHsdiUpNYsK1ediXyGtsB+7CUZ8p2iWJDO5IJ0bP9/qGEqAdSXbUZCEm44GJUNdsyyX8m1Ohk2081 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?kM0T6M82BPJ1o29Dbmd3Vc4oGSl+k5nUKZPv6mWePEz8d2Xh8qEFi9/+fQIM?= =?us-ascii?Q?FcmKn8LvGsF77TqPS5jdlHV+wFOhc9DTVLbwgnXCLyddS+qBej+9IXuGRkgN?= =?us-ascii?Q?Ji+rGe+LxBktUbUvQvuxKrHWaTv6bRhFQ43sx9vM+YqAKBUlyT5A7pbt8vbP?= =?us-ascii?Q?d2VnSxIZ6WZTfQPWt+gQbl9ReLu5m3NhdNVdy7MiO46IpmHrJYb41K8FnSlP?= =?us-ascii?Q?V/flyUa2x/h0K5tr99HCppLjSx/2yOvzJw7MCe3GO9UtypAWft42J9o3s0pi?= =?us-ascii?Q?dNaUjZxgIbbSgjMLA+UMMPFD3cMxSkOKM/Ms46jcTtzpyPMAMHabUMUXMASK?= =?us-ascii?Q?2Byi0k20M0DyS+5rzapj0wiSGQXq8Il3M9QeqjILYw2uaHbXnOfXFyB780jc?= =?us-ascii?Q?Rd2woBmwyosKBd66DZVTqnhWcVL/jCz+BFnMRBLfM505RisaOAdm572CVUun?= =?us-ascii?Q?9jO5hEjfUmRmJyPn9kCD0fXQONwZHG9LuO7zvFSXUsoDIvKBMgBCb/UpWS4k?= =?us-ascii?Q?x1UD2nBMMW7aLwayVPKfDfmQYm/K4H/NqNyEUm6on4n0Q4WNIejA8geue32j?= =?us-ascii?Q?3qMPkN9Ft0ILaoojuWC8vXjLHelyrt0WFfeJ0ejMeQhbgoXptQgUcWtuwXij?= =?us-ascii?Q?HT4ZA/f2OOMSshW53JBLJ4Fh/vr3SBdJUj18cA3M/QMUvdb7FP7NAV+YJzU2?= =?us-ascii?Q?NVSsVp3CVevJqKGe6K8VdVu/ngahKmU1+SPL8izMep/x+ZPAC/ffpS0rZpti?= =?us-ascii?Q?ZkXpiLpUFwcfG3GW3mZRuwdznGriLG9OnvAP/sfOuldMUDxrzEJ5l1x5y3nc?= =?us-ascii?Q?XCkGE8g4rUlIqszicu7JU18YxcgYT/hyz3sY1Fot44fqedVulyPIrlj2dhmF?= =?us-ascii?Q?iyeARObltxGUSgCuX412i/A8VedEbR4bUH22NosJUp3NK4jPby+7SW6jJpSi?= =?us-ascii?Q?76j7fOBMoA5IW3+0Uq82ryt8Eb/K/dxcVpmrX+WZC+6HvmrnxN9ZN0iHU7O8?= =?us-ascii?Q?QVjbVuUdLMlPCUt3wbnJwlb/4q0E22qFqwpkOay7Xz0O+hDRL5HmS7CS6foA?= =?us-ascii?Q?3Lktr/dmIOMOn/FPNkrCVCM8uvJslOmfarEH9LgLyq+WBkPnvK/DsmiGnHzq?= =?us-ascii?Q?/+bSjp/xf32mvExIj01vEVjnJ291FtAinS8OOgopTcZBX+0XgvWjvkI3dXjc?= =?us-ascii?Q?ehf4gd6JXlCsn56soZ3wyoX1B23EQVVbkVgkMPnDLmy97hfwkK0jtsrSopHY?= =?us-ascii?Q?RKvDJm/df0F6iRwbjRHW?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 36b67ca8-f326-430e-b5c4-08dbad39ee66 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Sep 2023 11:27:32.9836 (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: AM8P250MB0280 Subject: [FFmpeg-devel] [PATCH 07/20] avformat/matroskadec: Remove redundant checks 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: If the size of the data of an EbmlBin is > 0, its data is always present, as ebml_read_binary() always leaves the buffer in a consistent state (even on error). Signed-off-by: Andreas Rheinhardt --- libavformat/matroskadec.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index 8846e9358d..e30dedf434 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -2523,8 +2523,7 @@ static int mka_parse_audio_codec(MatroskaTrack *track, AVCodecParameters *par, int ret; if (!strcmp(track->codec_id, "A_MS/ACM") && - track->codec_priv.size >= 14 && - track->codec_priv.data) { + track->codec_priv.size >= 14) { FFIOContext b; int ret; ffio_init_context(&b, track->codec_priv.data, @@ -2538,8 +2537,7 @@ static int mka_parse_audio_codec(MatroskaTrack *track, AVCodecParameters *par, return 0; } else if (!strcmp(track->codec_id, "A_QUICKTIME") /* Normally 36, but allow noncompliant private data */ - && (track->codec_priv.size >= 32) - && (track->codec_priv.data)) { + && track->codec_priv.size >= 32) { enum AVCodecID codec_id; uint32_t fourcc; uint16_t sample_size; @@ -2939,8 +2937,7 @@ static int matroska_parse_tracks(AVFormatContext *s) continue; } else if (!strcmp(track->codec_id, "V_MS/VFW/FOURCC") && - track->codec_priv.size >= 40 && - track->codec_priv.data) { + track->codec_priv.size >= 40) { track->ms_compat = 1; par->bits_per_coded_sample = AV_RL16(track->codec_priv.data + 14); par->codec_tag = AV_RL32(track->codec_priv.data + 16); @@ -2951,8 +2948,7 @@ static int matroska_parse_tracks(AVFormatContext *s) par->codec_tag); extradata_offset = 40; } else if (!strcmp(track->codec_id, "V_QUICKTIME") && - (track->codec_priv.size >= 21) && - (track->codec_priv.data)) { + track->codec_priv.size >= 21) { uint32_t fourcc; int ret = get_qt_codec(track, &fourcc, &codec_id); if (ret < 0) -- 2.34.1 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".