From patchwork Thu Sep 30 02:58:56 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Soft Works X-Patchwork-Id: 30681 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp213815iob; Wed, 29 Sep 2021 19:59:27 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyk4IHDXd9W0Xk/UnAskPPnhn/XC8NoqG0sidr1ob25PrSKgu/xVhHhHy0IWDt/WMfRvT7r X-Received: by 2002:a50:8405:: with SMTP id 5mr4226583edp.228.1632970767042; Wed, 29 Sep 2021 19:59:27 -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 f11si2288447ejl.484.2021.09.29.19.59.26; Wed, 29 Sep 2021 19:59:27 -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=@hotmail.com header.s=selector1 header.b=AugnTsdf; 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=NONE dis=NONE) header.from=hotmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2B7E468A783; Thu, 30 Sep 2021 05:59:02 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from NAM04-MW2-obe.outbound.protection.outlook.com (mail-mw2nam08olkn2044.outbound.protection.outlook.com [40.92.46.44]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0A1A168A7B8 for ; Thu, 30 Sep 2021 05:58:58 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=gH/g3vF8oVE2h58mryWRdbSzxoT5SgHRUzbhZxZ49LpbCGtDrAxeCPVyDP2/qAsN3sfsz1DSbRilPoNlpQGR6lc+Btq6F9hbbmdUzwlSbn1hp0otvfu35hxENa/pkeYovnHKF7Y1YlJJa7VjC2Qf54DqpjTASh8HDBIxF5gXcN9aI4F/5RDeyiyJwrKyb/qCRGyeXHhmOnj4O6ENiet9P7xXpwBFPXnPeVJUI7Y1hmqYwbJJt9rhHxc3ZTxffCK+7nvZ/SMrj3ShOo+GtFEZuzuPMUApnyT5k9v/ygKlbqWPV7k5s63UdFSg8ysW3L69iLRD39HGko6oYIYMouolJQ== 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; bh=TKg75g9QQOYGDkfF5LEFnc0VIO6umC0I6E4a2M3SQpE=; b=WsVzvPblDC98cX7KgfKQ4BuCJvThn/tfJ4Upw5yNX1c3aUh5JWFtIJ7VCusI5w9QiEEyi5GEgJ8mDY2FQZskdb0v4Ht6Yu3aOxM8yAFduSWdQXlK49ZK1SIi8A/sUNOTpcix7oWDy8bJBVhxRNMM2+NtvheulbEN77IM5BHax0AZ/cCgIhvUMjuuFxTgT8oDkYxVyekyxoEDgQyCUqSY491gHPzZXVRamF1XxhXp1B2ucXw7tydn1xiZwGlmQQ1Qu9bxDVGlMevz1lV83oxWI1cBpSbVGO6Htgky4rfjDmvB5VoZO1ixviLpqsJgopUjQUD/LHqRARtfIC22HKeSgw== 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=hotmail.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=TKg75g9QQOYGDkfF5LEFnc0VIO6umC0I6E4a2M3SQpE=; b=AugnTsdfXj7/YZYc1S56F5qf7wOZM2xY8AGAp78lTEHgHZhyndzZJ0virLFCG2ZzOBGBkG76KnDhAFlSmzcKzQZuGn1XM7U/bF2mJaEVztLRYKSn+9ryl7dWzr11Kmz4ZPANJ7dVm2yOv2p3hk1U+EI/zI8os2dZG6zeE/L4ANPWz2+qb6+bAQa+BYoPQQ3EAFw9W4I2hD9s1CQJ5yCdxXpPmbTTSKGMkolAZNkF6xmPdeMWFryw7kOCBLWGUQtsoWmcRsdfP8J+hHE8KfufV2sRAJIhhPhta9U2dfnxuaEesWiqs+lCyLjZSoO7IL1WAipHSwSmaWLC2NKJeB5nfA== Received: from MN2PR04MB5981.namprd04.prod.outlook.com (2603:10b6:208:da::10) by MN2PR04MB5503.namprd04.prod.outlook.com (2603:10b6:208:e4::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4544.13; Thu, 30 Sep 2021 02:58:57 +0000 Received: from MN2PR04MB5981.namprd04.prod.outlook.com ([fe80::ecfe:2528:2012:22cb]) by MN2PR04MB5981.namprd04.prod.outlook.com ([fe80::ecfe:2528:2012:22cb%5]) with mapi id 15.20.4544.022; Thu, 30 Sep 2021 02:58:57 +0000 From: Soft Works To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [PATCH v5 6/7] libavformat/asfdec: Use predefined constants Thread-Index: AQHXtaccPrciDChhCkapMvaJlYWwgQ== Date: Thu, 30 Sep 2021 02:58:56 +0000 Message-ID: References: <988b43f9e7b04db23321657dd44ef8d769bea1e2.1632970597.git.softworkz@hotmail.com> <7f7047e8f7bc2a8bafa2fd47dd594df0759dbfb5.1632970597.git.softworkz@hotmail.com> <48d991c22de218e8ada8818da7ad3c866daa4064.1632970597.git.softworkz@hotmail.com> In-Reply-To: <48d991c22de218e8ada8818da7ad3c866daa4064.1632970597.git.softworkz@hotmail.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-exchange-messagesentrepresentingtype: 1 x-tmn: [TIGU9xRjVo9nD7epU7zLXi+h/aLxepPw] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 07aaf357-cd0a-479b-9f7a-08d983be3ed6 x-ms-traffictypediagnostic: MN2PR04MB5503: x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: LpynD9jWCjdZaD4BDtj8sc40vDxXnza+PAmlOlFwJcTTFll2xypX8W2VFN9Jb9jbUwRHEM1RPsXS02m6ygrphDWcF2JMQg/W7seIuMjJctSfN30cg4CwX2hs24TzpHCBkbzzEH4/NHtca4fTwG6mS9FsDeZhRV+fBI2WEIKbmlca9i0oMv8Pky8fyQay/LiKLdRmbY9fJKoCyREV0Dlms5T7JhfrK5T9i39b9c5eIvUwlGFlv78/n1FFutEmlG6a++PrEOiUCSco+1KYCqH6+nBCqks9zPeCAz0fZFv9y/aeBF5K4XUKgg9Z8wSiyLSlAupBj/bh5sEe2IyZBBs3wTbMBcpTUWCGrMmvO3DmL8vseijnnBHh7SyQzJ5bexTDcG27KpfcfDUOTb5J5vgQUVQVbEL4z3aUxLtvklh083+PBy7dGV3FskRxXdIp8vKb x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: hu3lFfonSi3HQWldh3dHEJrXXE+C34ffycpQRFRpVU5BrQm7cKR0lQchY0hrN8gP56wMoh/wlv3HkLz6BsdP0u64A0eD6e5GHzeGjvqVCK5B0gvOxXFISm1peI0dyBg2z/THcjv8xFkGFKDS+uS/VQ== x-ms-exchange-transport-forked: True MIME-Version: 1.0 X-OriginatorOrg: sct-15-20-3174-20-msonline-outlook-529c7.templateTenant X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: MN2PR04MB5981.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-CrossTenant-Network-Message-Id: 07aaf357-cd0a-479b-9f7a-08d983be3ed6 X-MS-Exchange-CrossTenant-originalarrivaltime: 30 Sep 2021 02:58:56.9864 (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: MN2PR04MB5503 Subject: [FFmpeg-devel] [PATCH v5 6/7] libavformat/asfdec: Use predefined constants 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: MFwTwEAJ2+O0 Signed-off-by: softworkz --- v5: Split into pieces as requested libavformat/asfdec_f.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libavformat/asfdec_f.c b/libavformat/asfdec_f.c index 7ac4e460a7..c4bcf0904d 100644 --- a/libavformat/asfdec_f.c +++ b/libavformat/asfdec_f.c @@ -205,13 +205,13 @@ static int asf_probe(const AVProbeData *pd) static uint64_t get_value(AVIOContext *pb, int type, int type2_size) { switch (type) { - case 2: + case ASF_BOOL: return (type2_size == 32) ? avio_rl32(pb) : avio_rl16(pb); - case 3: + case ASF_DWORD: return avio_rl32(pb); - case 4: + case ASF_QWORD: return avio_rl64(pb); - case 5: + case ASF_WORD: return avio_rl16(pb); default: return INT_MIN;