From patchwork Thu Jun 17 02:31:23 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 28425 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5e:c91a:0:0:0:0:0 with SMTP id z26csp198762iol; Wed, 16 Jun 2021 19:32:27 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwrnHHFpeIWmanDlxQg0zu2dUFUBMsmNbIrdCb/Coz6NlAxPBViAkYf1S5m5MSl+jlEZaIS X-Received: by 2002:a05:6402:177a:: with SMTP id da26mr3452835edb.40.1623897147280; Wed, 16 Jun 2021 19:32: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 v28si4190762ejk.538.2021.06.16.19.32.26; Wed, 16 Jun 2021 19:32: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=@outlook.com header.s=selector1 header.b=nCLywbuQ; 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 36B9068804C; Thu, 17 Jun 2021 05:32:23 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-oln040092074086.outbound.protection.outlook.com [40.92.74.86]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D6076680258 for ; Thu, 17 Jun 2021 05:32:15 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=cjNcyNLGGlkwiDKrbBPlsezvHI6JQcB0Q7BVq1o03Vhp+Z/bD/6zf4PTviU9etuPvXT9MwOmStVnCXc/6bIGgG6DRz8C1EjUUtbZE8FN+yhxI6QOb1Z6JAL4aRo5NG5YpPKQ5sGxKmrQEOTWgGf9aHKUdM1DKdvSqLUJj4p9vq2YvFYiZ0XPJP86tWluYF/mImViqT99AuRfS93j6aIfDlQ178fD/bg92mCUKu3XAwzbq9MRwrSvLCR3De4wbIWkOq75LzIYEE65NcrR2+jOjK3O0gpzYP+UQzSjmfhbOJq0ek7ZdgYnl2PN2QwXqwPagKDCNIT+lG6s9ZFXlUf/lw== 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-SenderADCheck; bh=2AXVhfj5FUXM8vrOLZs0xJLvepIy3+cLx6lsDtnZZcI=; b=g8qhiTLjU0vzdiCvwAB0pHUKrettcwxoiJ1xXRBXJ0W0vK8OKuA9Qt7YaryzKTq2tV1sR6Lm0lg8h3LqntzwMbbp4BFGvQvkNvoT3g+ZDA8GFWJ9FHR37yAGO2iAdFA2rQbL2DWEuechHAxXw3mlD8Nv5Y6J8Gp7eaiZTXo3zJcoHTPdlVGC3O/eYPTxrPqlNO4v/wUX/k0rWo514Aq/NTY1rXpeWybxhnlbmRqvLB82uinUdYRCKE3QXrDG0POP5OiyPlaXCr6Ib4ZQgSw5n5w+EP01gPnNJuyDiBKgBGNxqfKcDWBA2RKMEuSItGaf1RyScDrYYvy/q0fxJDfxSg== 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=2AXVhfj5FUXM8vrOLZs0xJLvepIy3+cLx6lsDtnZZcI=; b=nCLywbuQcTIHIO+noi8kBfgnxZBiq23g0FDRGpEFUmVV291KqJsFsLmTA2eLGzLUo/38ftiuoWa7xS3+guI5SAEQjmwKJIf2HBBvClmDuLpD4HHVVfexFnZ/m+DRKZQ2Tx3loTuVCMmMMUqD/er9IyT1Wdq7RvffIoUAbS3U/nCgSzHkUxn2mh4k56Le/KNcxmpDGhZ43K8Lhxp7CWPaRQSQHjSLXrtwdCvlarRZK1sYbKDlumgDmYmmYy//ZO3nJ35qQheSfiVA/T4sttHgfD+s11siv/gzoBqk9EpXZrU5Gg6hILqtKRrFXtSZjpG/irH1PlabxVQoa+suD4F2MQ== Received: from HE1EUR04FT016.eop-eur04.prod.protection.outlook.com (2a01:111:e400:7e0d::49) by HE1EUR04HT137.eop-eur04.prod.protection.outlook.com (2a01:111:e400:7e0d::65) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4242.16; Thu, 17 Jun 2021 02:32:14 +0000 Received: from VI1PR0301MB2159.eurprd03.prod.outlook.com (2a01:111:e400:7e0d::46) by HE1EUR04FT016.mail.protection.outlook.com (2a01:111:e400:7e0d::93) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4242.16 via Frontend Transport; Thu, 17 Jun 2021 02:32:13 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:56046221A8E2158D277CD6268857A16C892D11DCB40C61DFB8FC571870781533; UpperCasedChecksum:646EA75783D94D79E27D0BF5F96C7EC495E3AF94DF6C5A21C585BB6CBEA0A1FF; SizeAsReceived:7602; Count:48 Received: from VI1PR0301MB2159.eurprd03.prod.outlook.com ([fe80::d9b:66ba:63ad:967b]) by VI1PR0301MB2159.eurprd03.prod.outlook.com ([fe80::d9b:66ba:63ad:967b%5]) with mapi id 15.20.4242.019; Thu, 17 Jun 2021 02:32:13 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 17 Jun 2021 04:31:23 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 In-Reply-To: References: X-TMN: [NCC3RvN9FZ1BjGpd7iItlPM7lr3Sv8jo] X-ClientProxiedBy: AM0PR04CA0115.eurprd04.prod.outlook.com (2603:10a6:208:55::20) To VI1PR0301MB2159.eurprd03.prod.outlook.com (2603:10a6:800:26::20) X-Microsoft-Original-Message-ID: <20210617023202.1318312-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.97.82) by AM0PR04CA0115.eurprd04.prod.outlook.com (2603:10a6:208:55::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4242.16 via Frontend Transport; Thu, 17 Jun 2021 02:32:12 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 48 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: f05f8fb1-977d-4066-3ae9-08d931381d3a X-MS-Exchange-SLBlob-MailProps: +LiGfBxqLEuqjb86iTW3gk5Jbr2ZJA1O/ECCljvsQhKYbC5MT0mduYolhVZyWpXy37cw4s9iR+0UPzXUX2X1kyaTgazO4QQnFS84ewn7LlzwsrTRyXTYY0U8uj+DNQpRUoNyB5AoQorlrjZJ9BiBeiwIcP00rxIYAiI8F04tHRelhGCT2VpMJ20LZamNZK5d6YyoQgtVAw4jGkv/PJDFt7aQLmvalCg2bSJW/dsxLVRDs/hEYbUvCmH4px24NBHhWkaBIAPmm8+dG4I04HZnnvPVrq7jpj4ET3E9LJKCWrB1lHaWOyFySahuJKvT3I1OI27hlG/oY8VRNIucAVNMAXsJZsCDlds/SoJf8Cb3iNvgTVA8kArVq5X4ccz+GmWxgQCeVvXdj9BSI4lrD6LT9XnUdE19eFYerk1g8+U5vNXo1FY/ZCQHataB2WnEFd3Ykt6rzUa8FwexOssnrsnxPYcjIC/N+oO4+f5XymMbiQXpXUS3H1x/2mrmdxq6sMHlWNqxG/GUv1/FrDU0NTlWlLAFHXNHU3B5Th04zkfBVK9IPfwmqWOSbMGhishcADqZnnL22YIuyqjPZHlv22KdqQQcuxtrNtbqBhBw93MObb+CPQ/66qAYHBHbNzQUKxI5GDEgr4A35uQJFp1SykjOARVDEla+EUMU7dIYAM2Iqxm6+3PqY4NwgbsUcf/nOJnLFTJR5zvlJkRAGp8FH76qof9ekSiAa+Znr6+BhHjAQ4KpRT4iKxbWaSNs8cdQqA3of8Jb1W1zyQSNGrDGvTsrnKhOKtK1sRei X-MS-TrafficTypeDiagnostic: HE1EUR04HT137: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: A2MXIzTOyaNd5IqEfpQu2WkcJq5V2A1nV1XlNziH9SDvQ7Q9lgCEI19SHEAdquUuWD3KtZlwgMQMpkZyTgBo9Ho6KIT9far+ja0AVLg8xdw4OTgwiWSe+5LHUyzKqrlFoAGMUp+h1TCsKLzKQps0eO39qFzfY0ZA3A5+IDPW/1sOUQQbg7bAN91uaVQQEDkBuNFHueHeh1ZIcQUXPgxqrd8BPDW9Fwsc3hziOsI+CmYCyJdlriivOOXnA5OnQPJZTpbD5wu/KLp8rBqv4ulSumCcuUCQtygwtid8XAZTbgVIkIRjM2HUKkhWpRx0SodmH6Xom4W4g84R1OjQ9u+6gmUc1lJC1OLJi5mN60Shq5+Ruxm4RzhwXjjr14z/7Gl6hVN3h1FRKf9YgxYnwFK+bg== X-MS-Exchange-AntiSpam-MessageData: /l78y0qUwmNZ/5X1YqO7YGyH5nCc3wFwsuO2AMKgbqjrb21HYAn0dFQoKjj18ia2PBji4yFR6E6DBhrjBpxVvdHlLtUVHMVD6S1LgcSfVJHz8+pKpn425gDasEZZyJNgVm9g3gGoOdnWlDwZS/U59A== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: f05f8fb1-977d-4066-3ae9-08d931381d3a X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Jun 2021 02:32:13.3878 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: HE1EUR04FT016.eop-eur04.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: Internet X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1EUR04HT137 Subject: [FFmpeg-devel] [PATCH 02/41] avformat/Makefile: Remove rawdec dependency from aptx, codec2 demuxers 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: wLYWpOpOBWFq These demuxers don't need anything from rawdec; they furthermore only used rawdec.h to include opt.h. Both of this has been fixed. Signed-off-by: Andreas Rheinhardt --- libavformat/Makefile | 8 ++++---- libavformat/aptxdec.c | 2 +- libavformat/codec2.c | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/libavformat/Makefile b/libavformat/Makefile index 7000180d48..08f260622a 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -99,9 +99,9 @@ OBJS-$(CONFIG_APM_DEMUXER) += apm.o OBJS-$(CONFIG_APM_MUXER) += apm.o rawenc.o OBJS-$(CONFIG_APNG_DEMUXER) += apngdec.o OBJS-$(CONFIG_APNG_MUXER) += apngenc.o -OBJS-$(CONFIG_APTX_DEMUXER) += aptxdec.o rawdec.o +OBJS-$(CONFIG_APTX_DEMUXER) += aptxdec.o OBJS-$(CONFIG_APTX_MUXER) += rawenc.o -OBJS-$(CONFIG_APTX_HD_DEMUXER) += aptxdec.o rawdec.o +OBJS-$(CONFIG_APTX_HD_DEMUXER) += aptxdec.o OBJS-$(CONFIG_APTX_HD_MUXER) += rawenc.o OBJS-$(CONFIG_AQTITLE_DEMUXER) += aqtitledec.o subtitles.o OBJS-$(CONFIG_ARGO_ASF_DEMUXER) += argo_asf.o @@ -147,9 +147,9 @@ OBJS-$(CONFIG_CAVSVIDEO_MUXER) += rawenc.o OBJS-$(CONFIG_CDG_DEMUXER) += cdg.o OBJS-$(CONFIG_CDXL_DEMUXER) += cdxl.o OBJS-$(CONFIG_CINE_DEMUXER) += cinedec.o -OBJS-$(CONFIG_CODEC2_DEMUXER) += codec2.o rawdec.o pcm.o +OBJS-$(CONFIG_CODEC2_DEMUXER) += codec2.o pcm.o OBJS-$(CONFIG_CODEC2_MUXER) += codec2.o rawenc.o -OBJS-$(CONFIG_CODEC2RAW_DEMUXER) += codec2.o rawdec.o pcm.o +OBJS-$(CONFIG_CODEC2RAW_DEMUXER) += codec2.o pcm.o OBJS-$(CONFIG_CODEC2RAW_MUXER) += rawenc.o OBJS-$(CONFIG_CONCAT_DEMUXER) += concatdec.o OBJS-$(CONFIG_CRC_MUXER) += crcenc.o diff --git a/libavformat/aptxdec.c b/libavformat/aptxdec.c index 489194f49d..dca76ae117 100644 --- a/libavformat/aptxdec.c +++ b/libavformat/aptxdec.c @@ -20,8 +20,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavutil/opt.h" #include "avformat.h" -#include "rawdec.h" #define APTX_BLOCK_SIZE 4 #define APTX_PACKET_SIZE (256*APTX_BLOCK_SIZE) diff --git a/libavformat/codec2.c b/libavformat/codec2.c index ce249d4470..9c94ed81f9 100644 --- a/libavformat/codec2.c +++ b/libavformat/codec2.c @@ -22,10 +22,10 @@ #include #include "libavcodec/codec2utils.h" #include "libavutil/intreadwrite.h" +#include "libavutil/opt.h" #include "avio_internal.h" #include "avformat.h" #include "internal.h" -#include "rawdec.h" #include "rawenc.h" #include "pcm.h"