[FFmpeg-devel] [PATCH v2 3/3] avformat/rtsp: Include rtcp in port range check

[Martin Storsjö]

On Sun, 4 Jul 2021, Andriy Gelman wrote:

> From: Andriy Gelman <andriy.gelman at gmail.com>
>
> Currently it is only checked that the rtp port does not exceed rtp_port_max.
>
> Signed-off-by: Andriy Gelman <andriy.gelman at gmail.com>
> ---
> libavformat/rtsp.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c
> index bedb75c7bd..a3026f8b73 100644
> --- a/libavformat/rtsp.c
> +++ b/libavformat/rtsp.c
> @@ -1500,7 +1500,7 @@ int ff_rtsp_make_setup_request(AVFormatContext *s, const char *host, int port,
>             }
>
>             /* first try in specified port range */
> -            while (j <= rt->rtp_port_max) {
> +            while (j + 1 <= rt->rtp_port_max) {
>                 AVDictionary *opts = map_to_opts(rt);
>
>                 ff_url_join(buf, sizeof(buf), "rtp", NULL, host, -1,
> -- 
> 2.32.0

These three patches seem ok to me, assuming you've tested them.

// Martin