diff options
| author | Andreas Rheinhardt <andreas.rheinhardt@gmail.com> | 2021-01-29 18:53:43 +0100 |
|---|---|---|
| committer | Andreas Rheinhardt <andreas.rheinhardt@gmail.com> | 2021-02-03 21:36:47 +0100 |
| commit | e9513052b533e4b528b3a7dddc529ee5bf74dd02 (patch) | |
| tree | a0bc75e2354cf444b2aa678a9116ec6b41817229 | |
| parent | 7936cfc157deb19730494d54d32d240cd0394f8e (diff) | |
| download | ffmpeg-e9513052b533e4b528b3a7dddc529ee5bf74dd02.tar.gz | |
avformat/rtsp: Fix build failure when RTP demuxers are disabled
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.
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
| -rw-r--r-- | libavformat/rtsp.c | 7 |
1 files 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); |