From patchwork Thu Jan 6 18:47:11 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 33131 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp1908188iog; Thu, 6 Jan 2022 10:47:35 -0800 (PST) X-Google-Smtp-Source: ABdhPJwcARmlz0DKhNQL/rN45LeZ1RmNc5FjEKoeqDU33Iqrza5PEiBJM6rg1b4k7TfxLrFedCeo X-Received: by 2002:a17:907:2704:: with SMTP id w4mr46676136ejk.134.1641494855262; Thu, 06 Jan 2022 10:47:35 -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 q11si1567002edd.18.2022.01.06.10.47.34; Thu, 06 Jan 2022 10:47:35 -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=pwzOcAcp; 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 9F6EB68030F; Thu, 6 Jan 2022 20:47:30 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-oln040092075091.outbound.protection.outlook.com [40.92.75.91]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4C65068A868 for ; Thu, 6 Jan 2022 20:47:24 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=d5min8ZcLiCLP7nR5f0R2hm1QnwG+2xAd/3d4efPbCM5wSbi7p4dDQJMZnVo27Xs3Ntzw9v+2ovW5fRwmMqsUyJMGD/MfYOQ105kEhnNTZ6Ctw6mDMIzmXIsqR0AJpvcLld+l10xQ7yvPU89B/H9uOB8ktpZMsh4uQS+cE7yA/cCC/djRUWpE3JSohXLYQNSkLM6JWw7TzlkqS1ONXtt+rzcPPf9X96/JiECZwJNlQXRybC8ur6dV8oj+G+YYxSga87ivGEoFbLiwjtCg8KMTUsGUerCXTvTxJjU7gGyyPu4el3pXJSPnWRR/8PUnMzKnVkKHvFWgEBTl3348eoQcQ== 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=+ZNcVEBELTDidbjo1l27ysoPzKFB3a2auGquFXXafcI=; b=P7OljZNC8Zq1pyvJdA7RGyltAMYbVlpHywiuRBH5iDZndLKvYkdSq/UIteZwT0shDz6szfwzS+y2gtdkBCQR73NksyJC6hI+WZ/Q6GDRpcTC3oysuql3w5rATG09XcgtCiHisDSbnygYD/udWUnu9gc23WanL/JMOJaWXaHgDxH5cbj042tThNJQcPc8wqbYCp+KTmDbwKXYJtxZGbWLx/JvKoC2s/asCUObxGtfI+fgtVNMU+iK5ESlABo4B8ZQWCXULvw2RRbXlQ6gfdxEzfclV7bYKqUYcDWlIBdp2SPnU5FgsyCBYwymj98GPpVP21TzW2c6kmFYPWfmmMAO+Q== 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=+ZNcVEBELTDidbjo1l27ysoPzKFB3a2auGquFXXafcI=; b=pwzOcAcpmkDD9tos8heSD2niYFhE3O3vVzGyQBkICV4tM2L2uGifbsgIuMKMURnIzOXr1YtyxCGTh2yXO1PAXpOcEJENzRajgej+wDimSs806lt6GD2BzzWbkMhbkCEAQV+u98Xt7+vR6vOxSbZiFopB56Xag5SkT8LPyPaecRifEGip0woqirlqw8xk5dPs98ng6tXhhU61UeCGuVMKRo68UQlh57Dt+nZDIPPgcNb9DoXpwaq4a/XMZZ9wosta+4IHYJ22OSJIh7H3LnIWy1+VsLOSmSEKg72E3UL5DGW/CoO2wKBwW+j3iOJLD3BWqwmU01tzhW4HdcjlZS49Fg== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB4104.eurprd03.prod.outlook.com (2603:10a6:20b:18::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4867.7; Thu, 6 Jan 2022 18:47:22 +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 18:47:22 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 6 Jan 2022 19:47:11 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [6+cUp+MKwOVAmPUNTzBvTGBBSMhUqq+D] X-ClientProxiedBy: AS9PR06CA0045.eurprd06.prod.outlook.com (2603:10a6:20b:463::30) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20220106184712.2025099-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 337a8f98-cd10-49c0-b3b2-08d9d144f942 X-MS-Exchange-SLBlob-MailProps: +LiGfBxqLEuBoyQUf2rHPVuupI3Je4ybvd/s0rYEip7yGdrVFtUDp+1DxZUzn3gTo+HIrCwWhbq27Aj4dIxycvNBQRlL1DR3SnX7vaCpst/gMoEltuiFoPO8yatgW6yXDyBw9vJHtLCBnAQoiCXprGHoyOjWiVF2seVA70SGgqI4miYWaYaqqlpaalMfvLkrVIguSPay2nAo6XWhhZfBH4pixG7L5Uzm40GR91eFnBpM08ywDz7sRiDQv6Xxv8ahT6e2yl47GjeYQ3JGx54PSxXRtZtOhPT8+5ytMXF89/RJWEd6Ae/WgjRQcmznd6QNu3xAhfnmbisMxjUqq+QLEdQ4l6Tg96A3xegSLSGV4RuA6ubpQP7MrdQWON4SgbmAqnZBMst8JZf2TShnWjBEb/n7tp0MJQIa3m/BvSrfStsNl7tzEaRTBFkeLCE5vRri2j94snymhynGtZKmzVlbqFasqFWNcnRGGrUKHjvMGpsq+oNguMhFtzBzPOLhClq6+Vg6fw8C6efYaPVvsMy6zA5N44SCOQ+qjacRx6dQEEO7s+aU2D4d2cw+Flh8qgrGxZQsi7GXDfeZvnBGiPUwxzotcbroh/9tRZhY4I1MPXTlnwh1XRAW+emQGX6HMcPJ9aDabPf7SYrJbPDJ5z4GuZK0Q1nzmxP7vDLGmZL4bDayAbLiCJAPpmdgCpuVVhDpH+DGTITV/3EFQNJgsuBsgPYAcqbikeJtxSaWGDTQ7/An7XfKcBsyPZADdSeCUGci/ykUuUzPGFpJ3hfheVTNMFeUL0atuZbl X-MS-TrafficTypeDiagnostic: AM6PR03MB4104:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: NjwxwRtAHIbXMWNEtXGDop4Nev97KUyckWz51DVi6ApQh52YwS9JHUbS5E+s8KKToXEWS2JFgt4eMKtgNVWPbt8PMAkzQsuFoF0aQOVU9SRG7Z/9s5Y9wGmrzvVWSB18LN/7HxO3oNrY3S1KvFSSrrkWoQDG7YsJJgdxobVtZ654+qcapX2mme9Bx63NBYIe6YiOPGrUFRj/oi7Bks02305kBCeGFUsTFCj9fN9buW8BvcNiel6URwv6fbAGTX9Y1pmNzkqCObmMyvMJoeuaBTaWOqiy5o5UUZPku3eQXw1TV7hW9UWJtCZub/JIJsmn9QSZ3/o7uLATQjWzfO+GNJ0I8l2LyFeXuNYRrAHdtN9vrzbkvlP4EGPGc9Sh0pcz5s9nY3gJWmdKIxbsxLinALoLU+5RrL+TJDY4MUzWLyzXv5kVFaXIhpXthLsX8qxSWC3gplsPgon7cnx+CgUwP1h/F2okh5qLcSMAyOUdYLAVKqI99xEEZX5I96pcq2EnOaEwu5Gww6uwihIN1Y4hvXE9+lnhzRhfH+aPujZLssaHZmT4iUFLPqgBZdUuUOodJag3yXOrn7Q4EMlW8NmDXA== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: XJtxSvy9CjojEfKhGiHQPq/oWnHNskDY6HxmlMDLP1luBh89nojnxVSyaIquNmm7mb4kDPcW2uST3oEi4dneid0xBpP41Dzp9fF+SUAbxbGBY9I45HbESWRARhTrPMlKSs26A83DEIb+34DMmKu9Dj8u+712kiq2lrRUwNEDQXTgr2cmL+VfolXWFlFmovDG3Kuawn8i9lZ4PJcFMo/hNrl743K88i0j1094ck/A9eIJUtUYiYES+QMCpSI4mHX3uaNCrNeC9lHFSHITvi/wOV+JKmsZeCX6S6EK+qe4wzVrKWdHjLpMoadsMW21D3SecC3Z9NCfDgw/jTrtNQWrL/3QEkg62GD7APE74tGhAxHO+GIssEW3xJwW7dLM3U4ocAAhW6vsNdClWHZlRPycj/AWcjzGnSUKLt+bRu0DRECgD6yZKjNkPiVlJB6SKXEMHw+o+8r0AP6wLeiBQXKbzEqmsQW+hTZP1tTLjdhfNZzqi/om0QPbxVDf9XWablEoeUeh+WHbJoVLoCbKjAJhjfBvR4jwLEOvG7otCsUtclQLiro0KNOQyEfFqkwjvsoJOKh8eL1gKy7ka2RB8NxFer9zpP2M2/iUQ3b5JlBdf0K02Ya7mkcBfQfMnLb5gVUdfNMZYvp8/h55dr2m0qmdJxvXhOr5Ff8ImMKJI1rxYyjiGeeDQd2bcDhcssSIBHYt6u8i9Qlo3O4G905d5F0LfpZeV661NTN7cg7kQ8PV/n8IXT/psnMcDAP/bYUOU7LOL/qtKCUToB1s+V9s3L9OA3AnizQ9q+Qr4dg2dpHaiBpXB5E6N0SnIRBwG1tZhRHqAuc0Bw8jKn7HooarL4C/YVLZlXfzgg9CqRMSKpDAJ8FvPxTj6iCROqqUR8IuIWE4MRwEIqyoiRczYY6ZuRQ0csCQ9g/SKJj/raYcxOTgca7X7gOju6dNgx95Hu2vMA3m/5IZd7KxEdrdWrJQWeSQsw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 337a8f98-cd10-49c0-b3b2-08d9d144f942 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Jan 2022 18:47:22.4670 (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: AM6PR03MB4104 Subject: [FFmpeg-devel] [PATCH 11/12] avformat/rtsp: #if unused functions away, fix -O0 compilation 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: /R6EY24SZbyo parse_rtsp_message() is only called if the rtsp demuxer is enabled and so it is normally compiled away if said demuxer is disabled. Yet this does not happen when compiling with -O0 and this leads to a linking failure because parse_rtsp_message() calls functions that may not be available if the rtsp demuxer is disabled. Fix this by properly #if'ing the unused functions away. Signed-off-by: Andreas Rheinhardt --- libavformat/rtsp.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c index 1e091c7380..70c18941ca 100644 --- a/libavformat/rtsp.c +++ b/libavformat/rtsp.c @@ -246,6 +246,7 @@ static void finalize_rtp_handler_init(AVFormatContext *s, RTSPStream *rtsp_st, } } +#if CONFIG_RTSP_DEMUXER static int init_satip_stream(AVFormatContext *s) { RTSPState *rt = s->priv_data; @@ -274,6 +275,7 @@ static int init_satip_stream(AVFormatContext *s) } return 0; } +#endif /* parse the rtpmap description: /[/] */ static int sdp_parse_rtpmap(AVFormatContext *s, @@ -2006,6 +2008,7 @@ redirect: #endif /* CONFIG_RTSP_DEMUXER || CONFIG_RTSP_MUXER */ #if CONFIG_RTPDEC +#if CONFIG_RTSP_DEMUXER static int parse_rtsp_message(AVFormatContext *s) { RTSPState *rt = s->priv_data; @@ -2028,6 +2031,7 @@ static int parse_rtsp_message(AVFormatContext *s) return 0; } +#endif static int udp_read_packet(AVFormatContext *s, RTSPStream **prtsp_st, uint8_t *buf, int buf_size, int64_t wait_end)