From patchwork Thu Jan 6 10:52:24 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 33113 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp1535040iog; Thu, 6 Jan 2022 02:52:48 -0800 (PST) X-Google-Smtp-Source: ABdhPJxLzSQ01mAd1lkx952ftCYEUHrYX0f8LK9OljkFJx60VUrDEK55i8JLZHNrGcL47ADNXrzm X-Received: by 2002:a05:6402:230e:: with SMTP id l14mr47718208eda.370.1641466368326; Thu, 06 Jan 2022 02:52:48 -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 my3si781312ejc.283.2022.01.06.02.52.47; Thu, 06 Jan 2022 02:52:48 -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=FLTiVGLO; 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 D02AC6800CE; Thu, 6 Jan 2022 12:52:43 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-oln040092066068.outbound.protection.outlook.com [40.92.66.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D20906800CE for ; Thu, 6 Jan 2022 12:52:35 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ED0kz+2SV8w46TA8fd9Lrtf6d5mPg3+4FfOj/INlY9KFEiC8g24Id/8E1q4W2v4nOzVls+xCGEzu2fieL202MbxDGK9F4DRLUc6e5/oKS+kofkMllSHcN/Fzdi+SJAZG5cLS0Y3ZXV3f0nBinCMXngW7dfgYdEJhd5ae0thRbQHFgrJSvl4QjScz3+5aQN9H0vxvMeLVvpg7MSYXgT4Jhut3rzsDwDr3sg8/kNGcHjMowHn9ODSu92ArxMIsBe0LPXhIgy0ZpqbIIfbprCwHYkx7Q5LlBLADAdzMDyqN3HXqIca6W/LjeSB5T2j54kSsQAvIng9gpGfowBPIRPxYQA== 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=7gFFSKTP446cotulPerh+P4dWtia0I+um/81D4L3JaI=; b=gXHBaP/AKJorlwH/33tv+W7tPIUYwKYcz/i7cqsSJ2cdblGvCzxUgv4LbQW1OqZ9c7tcwp9bvNYZbw1puh7SV7OxWM3eBosPZ+4xQIsdCFcGkd0AGJ841TRsgN/+NQtmiUl3E30UnCmoK5Fpi7aR6YDKqFEZOVSPv0yOlBcPQtUxR1Eaj4AOK1elQ35l3UgkbyWvoDEIQo+7xi6Rc5+wSg2BjJpuhjSCuZrm3ISu38fIQnqm/dyLdFyIqJI8h5z0/EFLroZk67CBB8cJ3KhTyCaXnzzaC3U/F4z8izF5AEb302dW+q9WGbZsAOh44tr6IXBZfddD+IydvLdtYvYT+A== 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=7gFFSKTP446cotulPerh+P4dWtia0I+um/81D4L3JaI=; b=FLTiVGLOPEMger3a33OO40mTdM36QBiGfG1RE+BOktsaNoJyW3GIHhu0JgG8tas7jfmfGEuQVUVHzqZq+GLsvOdmERxomzdIUX+AOEFzgrOyc8JxEazOHW6p8/K8XnP1BB9dsbyMC2ywjANbxtWKIC75FYm0/jNGsBcY8ma2V5oQPxdMF+bj3GBXtyZH3GN8iVGNhu4z1RPlAp2DAGzGmjEbRj/FkT0TXkruS4igBXUKr0ryjUzpzlClF1qf/bcm2Q+l8dhmJJ2L1JhrZ6Wz4/BfaVEC0i9DbRa6H8NuO7S8sr3NC697OcmV4S2A3nUog/XYjfEw7qfp80ksiWrfeA== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB4294.eurprd03.prod.outlook.com (2603:10a6:20b:4::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4844.15; Thu, 6 Jan 2022 10:52:34 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::19fc:be9f:2c9c:53f5]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::19fc:be9f:2c9c:53f5%9]) with mapi id 15.20.4867.009; Thu, 6 Jan 2022 10:52:34 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 6 Jan 2022 11:52:24 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [PMgZFsPBTTwsxpTt7pDiHv0EImnkx7Bc] X-ClientProxiedBy: AM0PR03CA0106.eurprd03.prod.outlook.com (2603:10a6:208:69::47) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20220106105226.2200689-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: f5095791-213e-490e-900b-08d9d102a52b X-MS-Exchange-SLBlob-MailProps: +LiGfBxqLEuBoyQUf2rHPVuupI3Je4yb+f34X8jJfHg0y0OCywpiV48ItgUA5dzy4Ekebc+hN73RmFP/qTKKOQyl9Uwlzm7fPXsg9E0rkmDGHjxH9eZs9UuwJ5ua3SG/+1IDSU8yfiviXfzWO0xIRiKZKfYBhEwEuJb2x5LCJmZ4MzkLK5eB2KQlEj9ajuBloTwZdL7AJLqt4kXfc0pWiqTbG/0KP3scc2iFFSM+vRwMbCKdxnh5g9uBKslv0BOOjZpne2BUh4vmHsO+BUIfosL6Dv4q6YPl1HYC5AaoHYHuJPFomqLK5S3JYbL+qJHgLgENZH/949fHjw0qgE5U9s6ksXRA5U3KEO9ysAosUI2g9odG7RAqkDx4qXtStLzPSCvEquxVDnJ+Mb+arcyTcNmpfZE2tKoqcaCoIp1D4YGpW+5vt/C0exfV7GW20pKkeCwyFSA0iff4e1HWmOM2grcUWlowSXV1zkwCBmVPFkBJ8QL9Y9xqRNsAzGM9gabgeRHJucVZ/zWPFZYF7CW7Hs/Tmb+UUSOz0n1ii3c2/5DUM7ANTa/4dAjZP8KHUOMxwaSxYldV6eARNg7gFsFtT5AzcX7IvsnSNXvnyxQcMTG1YlQR6Pp9UiXtxxexKwmVl8jAvBqn2RI7mwyoc9A6xf8L3iD+yu+cO3S47SM80NkfnrbgzEJSlm+uQO+lgZ9op/5kg0VgLlg/lP7WZc6HzujCPgujIPcAMt2WSrjz2gryZxQ5I8XVRm9NbgMRMT0PJnjVI/iG9eXFu0+blX82UKPe7ovQZHuR X-MS-TrafficTypeDiagnostic: AM6PR03MB4294:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: /2Axe/PzjG1I/NVL6yAYxEz7kp73AZlScBWIH8bCql5dzhpTt2WvEkxJeKUhUg6MEqalZAuvBkuFKCpblVuC/KmoOkmRkFD+lil9xCD340Dc5ofAzZ2Q6UPXAteaiU2LtY/r2G9qUwNDz/ZcrlLWT/+yaqGb5O4qlINSvAX/IpTvtFeIMtESnJXEDrUxU9zwlCcxCEMF44xB3E2uy+i58XZijaOPKF7jePgV12QAZv3pIfaZuuztw8qMuH7YJblTIHO2TfLR/q8Ax5OCaXWv4ZiYkVpAkCKsCVpepTERPd0RoszsM/jSESf3daBRGB3VHMcQVN2tP2bGdFgAzsr4EoHXSi/heJYn/Iw1uW9hV3eZmihVDSQkx+d2RUPbiyku3NWqNVa+bPazVe6v4OvrNvcbrtqara7CxCSqQ96Tg0n0VoCYdZB4YXWkVEfYOjMfkNtWA0kiN9NSdXnMi3+Q5M4ulBMRfzEx4GAWJfc07W44TXlikdG4Y0UvthpSpeYOHYJqWp6dOkUQ8Ja9eqNaa1H5RwUIXwsqx0TZr3kWLpdlmpyyb4nINQWrKkRhbJUSnUz8qfb3HklaOcflUenXaw== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: W0HHxkNMC3FeT2GOZWI2rq8b1Rx2J1Ry/f6nvqAd4FhwI+k6fz/uhWJn5LQJSpLLJwKp7wUNPQCjxnB9ZA9OpJwc9FeRDlGcRwC6JDLaI5whC10dj5ShVGh4Eeyg4OMkWl4LODvRhPwUGk8bqiLm0sQ76YfR+he2zuUPvxCVi0vojbPL4jz0Cxnmk27TfRYjGkdocQHMFzYEJRszp9UJyGJ8QX1lgW41LCNpKVfzUBiUoWyHuuIvK5NSsc1Z1Z3t50akosJ459EdfWhm+Wb5qrkXkTqeiScO0jRM2OkJl8/MsnNvZ0/tOVuPTjeIkM9HbUZt9drHzY5OYsZdRZ59LhhrKRtfJqYYsMmnOXv7pRbDQ9X9APwSwVZeLwtd/6WX7e2KkhMZ1Zl45jbB5kQ/JmrW3zPBUGo6mPGp/BI5ITu1YJ+F1yUoCHQQ7VMm/5bUPxhgnC/gaDRJVdQbSk/zr5yor/lSFa5mGbakm7A7JVxRz/OOJ4QwaoXjnfUYTAG0yNC4KL3vHCl46o93VN1noIrrpvCAjiP6j6LhW12AsDQrZe3ck/62s0knIBHJzmxpUAHnrKopEuKZwpJBBHq9JEeYVFP7NPOpt3q+bxEOhV3YbXlb6tT+PKKARk3rfrO1TZ9PaL6oYRQl8QSkcf3EvspdzcW83wo3Qr33VCxxj+mhoIIDVrS8IVUY6Q4qNDaJH4nSuLmd1ZZ7LPI/KnbvUjK6iIAEeDO9YyAUCve20FdnepoYItm5XhdX7TjviPxo3OzWujbszNh2dfhJv1iIX8XH4e5WqhYEu/TQ+NrNg2NlMPt6XYvu7yVnT1IA8QahyQvajqE0xvtVUiYmZNZ6HNrBZFBXrWyOvz3gyJB+Co6tGQCSPrzJqfKfOBIcjovWRe8IUoz5CulA0StJjrJkAUFL3bqqpZF6MzVcO1HIXwXB6mgj/awzg5mw/tdX8r/7vdKGhn8V5N9+SwS6DSzsDA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: f5095791-213e-490e-900b-08d9d102a52b X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Jan 2022 10:52:34.3215 (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: AM6PR03MB4294 Subject: [FFmpeg-devel] [PATCH 2/4] avformat/Makefile, amr: Add missing amr-demuxers->rawdec.o dependency 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: nyGnOg33qTTv Forgotten in 1f447fd95463bbf39a78d886359a3006d82f6a94. Also only enable amr_probe() and amr_read_header() in case the AMR demuxer is enabled; this avoids having to add a rawdec.o dependency to the muxer. Signed-off-by: Andreas Rheinhardt --- libavformat/Makefile | 6 +++--- libavformat/amr.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libavformat/Makefile b/libavformat/Makefile index cc19325397..6bd8af1bca 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -88,10 +88,10 @@ OBJS-$(CONFIG_AIFF_MUXER) += aiffenc.o aiff.o id3v2enc.o OBJS-$(CONFIG_AIX_DEMUXER) += aixdec.o OBJS-$(CONFIG_ALP_DEMUXER) += alp.o OBJS-$(CONFIG_ALP_MUXER) += alp.o -OBJS-$(CONFIG_AMR_DEMUXER) += amr.o +OBJS-$(CONFIG_AMR_DEMUXER) += amr.o rawdec.o OBJS-$(CONFIG_AMR_MUXER) += amr.o rawenc.o -OBJS-$(CONFIG_AMRNB_DEMUXER) += amr.o -OBJS-$(CONFIG_AMRWB_DEMUXER) += amr.o +OBJS-$(CONFIG_AMRNB_DEMUXER) += amr.o rawdec.o +OBJS-$(CONFIG_AMRWB_DEMUXER) += amr.o rawdec.o OBJS-$(CONFIG_AMV_MUXER) += amvenc.o OBJS-$(CONFIG_ANM_DEMUXER) += anm.o OBJS-$(CONFIG_APC_DEMUXER) += apc.o diff --git a/libavformat/amr.c b/libavformat/amr.c index 0a044d69af..9250089cb1 100644 --- a/libavformat/amr.c +++ b/libavformat/amr.c @@ -66,6 +66,7 @@ static int amr_write_header(AVFormatContext *s) } #endif /* CONFIG_AMR_MUXER */ +#if CONFIG_AMR_DEMUXER static int amr_probe(const AVProbeData *p) { // Only check for "#!AMR" which could be amr-wb, amr-nb. @@ -140,7 +141,6 @@ static int amr_read_header(AVFormatContext *s) return 0; } -#if CONFIG_AMR_DEMUXER const AVInputFormat ff_amr_demuxer = { .name = "amr", .long_name = NULL_IF_CONFIG_SMALL("3GPP AMR"),