From patchwork Fri Sep 16 01:11:28 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 37950 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b1c:b0:96:9ee8:5cfd with SMTP id c28csp666753pzh; Thu, 15 Sep 2022 18:11:53 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5me708pex+aWZHCF/nswzBTMjdoTjGyNM4z7a2AF7ieiZmxpURrkwOk1WZm5pE+VD+aI0R X-Received: by 2002:a17:907:8a1f:b0:77d:8e2:66bc with SMTP id sc31-20020a1709078a1f00b0077d08e266bcmr1855834ejc.189.1663290713423; Thu, 15 Sep 2022 18:11:53 -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 j17-20020aa7c411000000b00451d2a123a7si763315edq.332.2022.09.15.18.11.53; Thu, 15 Sep 2022 18:11:53 -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=WDTZDpqj; 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 0DF4D68BBD9; Fri, 16 Sep 2022 04:11:47 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-VE1-obe.outbound.protection.outlook.com (mail-oln040092069013.outbound.protection.outlook.com [40.92.69.13]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DB56268B1CE for ; Fri, 16 Sep 2022 04:11:40 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=nWAE/26thPJG61bNJeh60hdvr99+m6qyr8uC6ImdMcdcuLtung5SrjV4BlcTyjgomJUtee4elz0ouemHAMckLrf3rDdWWoVj4XJqYbXciAWXvuVSdwD9scfNOkxPM7mjLukV1Aq3o7hC39Jr0UeFEbWmRzfnX1ttxpbeMncC2Cdatp4AFVT9GsAq4vsXC+vg+l2bwPiHupyVFfbdbH6TmQdfs/DC8Jt188qZjls1Xu21yqhp16lZ3Nepfm9yAxizU44OwvQqOGV0iiuvIEH1jy7ERMjTRoiTY7rHvyz0XdyansBy/uHwBlgC8TvFMnp3j0DAetWWOU1G6Nj2GlzRBw== 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=Vm/OFVrXJKRB0wS/8pI6r/02C/b4vpX0MNZG8mKQrvo=; b=MAXN3nPcHMsyQG+TvOncADXAWLg2csS2mAR03sYfNyn244NBpsOxO0k34l8fm0vF2cCAX/EwJgt5wU8fxoLRJMz20/6Sp2jvNRBpC/TRl5iPcpCWNxBfzYxMi+FH9W9B0+rNDAVipbwkEBC/VPWS34dDLNFTUDJIZr/sSHe+slNYMoROSB63GV23CG1c8AlgCWcwZnqmXBGQSjcwfMsSCs4OImc2ooR+wJydWA1uVAuL6K+HkJQNFYlmAkQ844xLnT6zTMnVbHljlpoAjaxw+vdOcbxe2Krw5B5SD1ykpxmNRWr5h/TcOlr5oEl92IF4IL/Lmrrz80MmMUcsVYvVKA== 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=Vm/OFVrXJKRB0wS/8pI6r/02C/b4vpX0MNZG8mKQrvo=; b=WDTZDpqjjoJ0Xbc+jOuvoLS0bo/BthP2NLlVCGfmXEB8Bdjd6hXcG6Uh8aF5xAZxE3EF+jbROIokKrSnykDQjh1FGdk3l/vc9jol1L0lKgCsDl5mUiF3q3sVq7UMGQ6rE7QOKOagtpgeNmDWcut1c0XQ1lLtHBJRFWoZ1q/NgBn0J20XOl/Unwe+zGGqi2p/qazuDEUoQM5udg/OvAcZY3jhk782wig0a25Svbn4HLxjgIx2VbnXq7Jd5MFUJz1PzS7LMsJ2JloLhVbEnjhjU1ZXcABEOyS0QczVXtfGf+JNuXd2sQe5rETJa4G3ZZkyFRhafvVj+KHO8zDJTAe1/w== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by PR3P250MB0065.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:177::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5612.22; Fri, 16 Sep 2022 01:11:35 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::51a4:ed23:ea45:dfeb]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::51a4:ed23:ea45:dfeb%8]) with mapi id 15.20.5612.022; Fri, 16 Sep 2022 01:11:35 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 16 Sep 2022 03:11:28 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [VQHEuF6HwF4Pcp8UPPB95cB9+bohKeZVu/D9DXTkHJQ=] X-ClientProxiedBy: ZR0P278CA0186.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:44::7) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20220916011130.3120959-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|PR3P250MB0065:EE_ X-MS-Office365-Filtering-Correlation-Id: f90bf1d0-464a-4f8f-dd41-08da9780663f X-MS-Exchange-SLBlob-MailProps: AZnQBsB9XmpAR802nmGrL5i77DvupB32jgijRD7F8YtOOUF6IXQtInNCp1A1XZfCtn/jIoONJ3XsnN9NXANAzoBqTItcYLNbJl0DNXfG4gTMCkitFkmOq6GB9r40eMmpEsx7oToWASOKBw0QJ8DHN8cuTF/m+50iHtmrSrO/amMfdkWm8jPOkPSrZdAjfYh8euR+M/8KMWn4SgOYW07Sy+BeEhpuJBK6t9BBErd0fJRDnyOshWeys0pmiXxEEjOQYQQSK2Lh7Z3sVftTmI+/QmwtIAmVgWPVabjUHeDrTkclMjpV/ZZZnvKL10P28tmL4q/k+x9YluPdya3VQTfdfS4n4imnzBmMb8nAoxX5aUIRRRr2Q7Da7qznDCJP6hOQdKOvT00fy6SgA+gA1quWRx1HiWiXLDSbMt/YXry3a19I6+cmzzNSENrrceLAFoU89Jy0WbXttR2XoJnBeSlWwd6rOLjDv+d5t0rP0m9OclVgwcOKkTExn0nZRKZp/x3ERfaos7AxM4j5OiB0SG613vzKd60fIl7loTVbvJhAoSMGSPN9gY3GA1DvqbPgui9Nq8np/kZNEvLylNBCSOaqsIoAPCh/yVy4hh7sBmCVum2uIV9n/VGLjFArPmsZin1fojR8O3u7VRwW8rXEJ1n21uCxANstTj7nXEI1GNXB7n2F6TMtl/w6Txd36VcLIHcdvvb7LTFApF80Kl4xrJpAGfajTgJ78Ji8jnmhcF44Q15qW44lq+XF9h8Nf10dBLtXs1ZHwCFd+U0= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: mEqutBWIOZMxKxnlwM7yNwIss+X5woSOZcg7k3q7KFUzclolORe9PCEtfup7iXtk+rf5g6bFprku64TLtAe0+nBcbEbdtzIJjl0mfRPYNTjb5OgDJEukTJRj1fg+NDlmQ5sYrHp2fXbztwHkjY5vBL/kbeXO9eUeBQb5Yrv0D47izEkSpLz2xF1toR6CWhyAK6kPQiJ6UT1fl29AUwwFhS2tO3jWoIO46oW7t7uT+Bv3OKk4YYREqVUtQeXSOSwB1CXcsVsakGiupGFr7Z8aIKEsqZ2tVCbumGTgoneHTJFSrdVVYPH56cj9x8JbwkMSz3xehGX5/dvxbyNQxgAAPmzlXXQ8n6tXp/DL7GrYeDNbak6wbhq9SIUMmMNdGYQTbUhvne/yAVmqZ5+hZI+WHZPwWJvN1xOorR2jxodJbiR+ncbkl0Z6J4wWw0t1dbb+Vz8AG/rqWhvCN8R9T4Obj3CPGHpfGKcQjxDardVY9R8KA5r5XPrlvN13Vm4M5CqaGU41AmmQ77govkSuDM+bpQblaJlQFpmvKhEUV39vzBPrMxaAG5p67yQyw3t4mP0hUgKtFimCVS5bt926aZXbPj3dHE4WBK9GUXqJqM+aTkGEsQbNLXVtXdMcJGcUVLmNcUzRsTPu/rY9t3HijO1lTg== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: h6rcigVoDLd/pjlPO7L1qhECyiGW30KY1jQUiiVX8eg/nnd9ZTXcRq8YB83v//07+PPI1+7cQasRRj2F2EZUeWAVIJYooJFqOVKbWPBmUz6Z7Yq9aY+F+W6U7J/5R+rBIZfc40YaXV+VcbmIdXSJvF0K1fFonoIzJACk6QwG7by5bqbkTTtBIa/xRQWWpMi5p/n8OBW80vZbId47WbOwy6HbTIqZ3s1r24SO98P0iFzBkkL5fs842HcKnv7VB+6SWwbwPLAZb0fD1Fxixq50X1ELvM0yejBDeIhpBWQvKIM/SbywoH2eAZDPDLPqY7SvAdKA2ojHGWG9Sui9a/7P2V1lF+3EgaWPk5yz/OnJq+HR0BE94PPs1IHP5ZjckWmlCVCZaVvQjZho+5Mr3tsmQmYGKMkgNp6zeOpl7yLSn7GZ1h7+cHbI6LnxLguIdZI5wIC3yrM3F2JfylQa84Bw/Gi1zMUVIFkSCtTKIMeWRUBgw1IXU+f/qjsqEDTOQSDe2P0XNCl54dzIPBHr+HWDawFZE/d2AXmcIzSOIa39K5dzLav746eMBEEXElW2nuOfLwatvIr5D0oGaz2yg2y6pwmax9UgC3O75ecNEyDrKSiaBNnZKBlN71TvCmVSdTEdSD5KFXkeQ+fhyrwu/j2Dx7SR1e536ERj+zpVouaGp02dhjagb/KQ6ZUBBhsqKyeVFOUMGZonYDFKgSQ6HDaaLrGCE7IJlleKfYcQTLm18FCHHRxw8qfipcpqxQ3Sp+jGA5cpAY+84AKNUqznTEnKRjKEm2Uj74Y5mEa/9L1PeezmEBbs5jNyVjieVAES3EyiDELKc2h7RDImXkjfFQSjsyF64gLJHvzGsF3txP2f9lNk/kz/V6eOvWKSLAb783QicmjAV/vT96vZPQ0umZgW5KqWovi4nUh97dtYu0xW7soVnhADrnI/11IzwDaWDMo7pQlrSWkRpGAUD8uSkwRDZ5RbzcRj01kH3lam0+oYAdTeSOt+gZbZae8CnCG3Gq4yU2Ip7x03Myjc91vaKA2CiMdG00hD085GtLEUKUhaMDEAhPP124EGnCbpmfIYdAgEVvd/e4XSoIBnSVDRYFT1qVQ4RsIiEVSquhPfr6Qq/i1igWlHIzqQVNcDSMCwCkb3TLzv/CfROQh1q2+22cwtWSBZ3l4RHUJ3YQ2LSZrBZcmxC+FFsE8pMqg63LEGcgk/wYP1//2I+7GM7p2ZM5ZL9pBazJUWsz//uB3ZOASM3CcjoD2Lb2N+dAxTG8AANW9GgfixtYAREYS9qYiOgnInjntPUgQ4nnxM9k3tb5M6OROZE+MJfaGuI5PNDfGX99hY X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: f90bf1d0-464a-4f8f-dd41-08da9780663f X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Sep 2022 01:11:35.5759 (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: PR3P250MB0065 Subject: [FFmpeg-devel] [PATCH 3/5] avformat/dfpwmdec: Inline raw_codec_id 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: q7AOc+iTD7YF Signed-off-by: Andreas Rheinhardt --- libavformat/dfpwmdec.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libavformat/dfpwmdec.c b/libavformat/dfpwmdec.c index 685b95148c..98fb4102e3 100644 --- a/libavformat/dfpwmdec.c +++ b/libavformat/dfpwmdec.c @@ -50,7 +50,7 @@ static int dfpwm_read_header(AVFormatContext *s) par = st->codecpar; par->codec_type = AVMEDIA_TYPE_AUDIO; - par->codec_id = s->iformat->raw_codec_id; + par->codec_id = AV_CODEC_ID_DFPWM; par->sample_rate = s1->sample_rate; #if FF_API_OLD_CHANNEL_LAYOUT if (s1->ch_layout.nb_channels) { @@ -95,6 +95,5 @@ const AVInputFormat ff_dfpwm_demuxer = { .read_seek = ff_pcm_read_seek, .flags = AVFMT_GENERIC_INDEX, .extensions = "dfpwm", - .raw_codec_id = AV_CODEC_ID_DFPWM, .priv_class = &dfpwm_demuxer_class, };