From patchwork Fri Jan 29 05:22:54 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 25247 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id D796844B8DE for ; Fri, 29 Jan 2021 07:32:21 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C141468A76A; Fri, 29 Jan 2021 07:32:21 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f43.google.com (mail-wm1-f43.google.com [209.85.128.43]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 475EF68A767 for ; Fri, 29 Jan 2021 07:32:15 +0200 (EET) Received: by mail-wm1-f43.google.com with SMTP id m2so5916554wmm.1 for ; Thu, 28 Jan 2021 21:32:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=OnwmqJoNDwepJGiWlIReMCzg22Q2i0/ayhCkwlaxcqg=; b=IjOmtRre4yKRK3Vf7gPm2JD75/KcM7PNxG8RnQvXfLJYMgzfo+yX2OzDGoCBlcyC/G 8wuvkvHaZXTqarUATRqUwTjlKFhwz3bDvxGXDV/wuQYxFAG+V0d1JxMCRfQxp+FEkYdQ kdjb+YAH3KwUraFYHYfVTeExQiDG5PA1tf8LMW4g+EbG5ppWlCwbGqf3XMFtjP2aNPjQ RZ4r333PRkLv6j+XTaqKfaoM8x4ZPxB0IXPAcd1Z/jp1gQyD+8CapzaSaKLvxIFwuDHe PguGxA2Cp3IPylZH1dMaBA6J3tbbyGZ7CGjRtCJqtqJU9tDgrng3P6fy7/2YVSdrf0De Sdhg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=OnwmqJoNDwepJGiWlIReMCzg22Q2i0/ayhCkwlaxcqg=; b=ASbGVv2hglmyi8+in6viVzjFFvBaZ+1ISdIfZ6Di5R8sTkh2dqMRHi6gWlc8fOjAQX Pg3pKJykvzpgKXu+5hIpCDHu7QQEHHyG/M1rMzBrP9BYQ6e9URTc/Plfm8Hzc68L07TP BXJ7D3O6LiumywFakCE8RiAYsiohJr6rineTgDe1zbHJ+EbTEY7Vfcst3JbABbqPkcVM fkICePCeTGjPsvtnB+7jLxTzXxjTRswNZ7eEClvKq/YtsJk4g0bxyoaYYCE2dyL7rl8V UZwYQjhXQxg7TBiKY+MN4bSER/eC4v5V1PhAD5BbAEcmfiOmnJq5hhR5Z7OgEQrAAaxZ mM3g== X-Gm-Message-State: AOAM532VJsCIu5ciqbB2+T8cWruwHekvJACDgjLjhqKgCVO8ZtStjvKJ DZkMFLSFkLPwf0ecRCiiMUiP5t4AnWc= X-Google-Smtp-Source: ABdhPJxXrYh1uMwEJLnId4mj0kNOijxLWC2aYw+ZsFvC0+DbfQk5J7w0uJImHFaik0SU26XI0ymLHg== X-Received: by 2002:a1c:ac86:: with SMTP id v128mr2094889wme.76.1611897978893; Thu, 28 Jan 2021 21:26:18 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id d13sm10068611wrx.93.2021.01.28.21.26.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 28 Jan 2021 21:26:18 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 29 Jan 2021 06:22:54 +0100 Message-Id: <20210129052302.3124447-5-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210129052302.3124447-1-andreas.rheinhardt@gmail.com> References: <20210129052302.3124447-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 05/13] avformat/rtmpproto: Only include RTMP protocols that are enabled X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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" Signed-off-by: Andreas Rheinhardt --- libavformat/rtmpproto.c | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/libavformat/rtmpproto.c b/libavformat/rtmpproto.c index d9741bc622..5a540e3240 100644 --- a/libavformat/rtmpproto.c +++ b/libavformat/rtmpproto.c @@ -3119,7 +3119,8 @@ static const AVOption rtmp_options[] = { { NULL }, }; -#define RTMP_PROTOCOL(flavor) \ +#define RTMP_PROTOCOL_0(flavor) +#define RTMP_PROTOCOL_1(flavor) \ static const AVClass flavor##_class = { \ .class_name = #flavor, \ .item_name = av_default_item_name, \ @@ -3139,11 +3140,16 @@ const URLProtocol ff_##flavor##_protocol = { \ .flags = URL_PROTOCOL_FLAG_NETWORK, \ .priv_data_class= &flavor##_class, \ }; - - -RTMP_PROTOCOL(rtmp) -RTMP_PROTOCOL(rtmpe) -RTMP_PROTOCOL(rtmps) -RTMP_PROTOCOL(rtmpt) -RTMP_PROTOCOL(rtmpte) -RTMP_PROTOCOL(rtmpts) +#define RTMP_PROTOCOL_2(flavor, enabled) \ + RTMP_PROTOCOL_ ## enabled(flavor) +#define RTMP_PROTOCOL_3(flavor, config) \ + RTMP_PROTOCOL_2(flavor, config) +#define RTMP_PROTOCOL(flavor, uppercase) \ + RTMP_PROTOCOL_3(flavor, CONFIG_ ## uppercase ## _PROTOCOL) + +RTMP_PROTOCOL(rtmp, RTMP) +RTMP_PROTOCOL(rtmpe, RTMPE) +RTMP_PROTOCOL(rtmps, RTMPS) +RTMP_PROTOCOL(rtmpt, RTMPT) +RTMP_PROTOCOL(rtmpte, RTMPTE) +RTMP_PROTOCOL(rtmpts, RTMPTS)