From patchwork Sat Jan 30 04:44:22 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 25266 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 701D0444236 for ; Sat, 30 Jan 2021 06:45:03 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 55F1968A92E; Sat, 30 Jan 2021 06:45:03 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f52.google.com (mail-wm1-f52.google.com [209.85.128.52]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EAAC568973D for ; Sat, 30 Jan 2021 06:44:54 +0200 (EET) Received: by mail-wm1-f52.google.com with SMTP id o10so8089196wmc.1 for ; Fri, 29 Jan 2021 20:44:54 -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=7mhM3SMJ9ZdER+IdS1yYQLm0pEEx4Qf6Qtw+u85CnI0=; b=Tifwkx665qWqwtjMHIvyqcurAEYfyIKJau6h5S4OsJL3ful4KvzKiN2duvG0JjA/U0 QwoepKEODlYz1fIi88EcqFoE5BRncIu0y7dX+9YiuVf0Onvfj+K5AfWwT1QlGs8zg9c/ m3N4Fb9tmZg2bj2t7iGPGJccC5We4RSlj/EsEdGut0IISRSr/xzoVt+mDdyrwXKv5JsV gtM7AHpikJecToB6LyU8+fdYmW+DrF/MJJ3rBxgn3Y5rMKLkp+ojeR6ZGvr8QUJiWUji pHN4qvDgwwg4IJgUQNvJnUp6lOm15XhX+WIbi9eJ5GlOdXocKWYcRm0BhzwfgvlxF8bB J7LQ== 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=7mhM3SMJ9ZdER+IdS1yYQLm0pEEx4Qf6Qtw+u85CnI0=; b=lPha6kmPHizZzypErkzcGbqG7ibfxuXXv7iBUfqkgE5JlBsGJXl8BRntuoLr5Jq76g jyipgnnmwwr1Ggh0HTZurT0qgE/D2j7/7Sf/ZlBJLD04c7520pqLnqrZqXMabhJmkptQ WWd+ez6rFmW7yoCYiap2fEtXR6c2d5BbRKl5wc1rDZiGQFNiwHy8VC8SYnn4v1SZvN86 4T5B+n9HW8FxzimH4RW7/AbSz+KRr4+xdzyZFQZxmeRH/hjUFUwM7UPghxm0oDcu4ZP0 ZXkdtpGz+7A52D5eUTCseAUXB7ClZoDJK+CWfWZxusIrJ9v+thNg5/7oFrb8Vsy979W5 /uQw== X-Gm-Message-State: AOAM530fPs/DbNtla+gdOSGHD/3wvCRUVpE9O8TkvYK5roMHcueIDK+g wfgKukAu2JXSv5IBjXr2E5UeJ7a2ug0= X-Google-Smtp-Source: ABdhPJyrM0XtKsiWCUPgEcSX8baUIRfLg9sll+MoINkd6bzxWlpwdNH1/zNJZe1az+ZlUTfocQdrdg== X-Received: by 2002:a05:600c:1986:: with SMTP id t6mr6333279wmq.93.1611981894186; Fri, 29 Jan 2021 20:44:54 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id u6sm16459025wro.75.2021.01.29.20.44.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Jan 2021 20:44:53 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 30 Jan 2021 05:44:22 +0100 Message-Id: <20210130044424.3677308-4-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210130044424.3677308-1-andreas.rheinhardt@gmail.com> References: <20210130044424.3677308-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 4/6] avformat/rtsp: Fix build failure when RTP demuxers are disabled 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" rtsp.c uses a check of the form "if (CONFIG_RTSP_DEMUXER && ...) {}" with the intent to make the code compilable even though the part guarded by this check contains calls to functions that don't exist when the RTSP demuxer is disabled. Yet even then compilers still need a declaration of all the functions in the dead code block and error out if not (due to our usage of -Werror=implicit-function-declaration) and no such declaration exists for a static function in rtsp.c. Simply adding a declaration leads to a "used but never defined" warning, therefore this commit resorts to an #if. Signed-off-by: Andreas Rheinhardt --- libavformat/rtsp.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c index 1b24496f3c..9a2933346e 100644 --- a/libavformat/rtsp.c +++ b/libavformat/rtsp.c @@ -1941,12 +1941,15 @@ redirect: break; } - if (CONFIG_RTSP_DEMUXER && s->iformat) { +#if CONFIG_RTSP_DEMUXER + if (s->iformat) { if (rt->server_type == RTSP_SERVER_SATIP) err = init_satip_stream(s); else err = ff_rtsp_setup_input_streams(s, reply); - } else if (CONFIG_RTSP_MUXER) + } else +#endif + if (CONFIG_RTSP_MUXER) err = ff_rtsp_setup_output_streams(s, host); else av_assert0(0);