diff mbox series

[FFmpeg-devel,v1] avformat/rtsp: fix https://trac.ffmpeg.org/ticket/7517

Message ID ME3P282MB18122D099DCCF5954734D2CCC7979@ME3P282MB1812.AUSP282.PROD.OUTLOOK.COM
State New
Headers show
Series [FFmpeg-devel,v1] avformat/rtsp: fix https://trac.ffmpeg.org/ticket/7517
Related show

Checks

Context Check Description
andriy/x86_make_warn warning New warnings during build
andriy/x86_make success Make finished
andriy/x86_make_fate success Make fate finished
andriy/PPC64_make success Make finished
andriy/PPC64_make_fate success Make fate finished

Commit Message

gaojiangjie@live.com March 4, 2021, 7:38 a.m. UTC
From: Jiangjie Gao <gaojiangjie@live.com>

Signed-off-by: Jiangjie Gao <gaojiangjie@live.com>
---
 libavformat/rtsp.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Comments

Guo, Yejun March 4, 2021, 8:06 a.m. UTC | #1
> -----Original Message-----
> From: ffmpeg-devel <ffmpeg-devel-bounces@ffmpeg.org> On Behalf Of
> gaojiangjie@live.com
> Sent: 2021年3月4日 15:39
> To: ffmpeg-devel@ffmpeg.org
> Cc: Jiangjie Gao <gaojiangjie@live.com>
> Subject: [FFmpeg-devel] [PATCH v1] avformat/rtsp: fix
> https://trac.ffmpeg.org/ticket/7517
> 
> From: Jiangjie Gao <gaojiangjie@live.com>
> 
> Signed-off-by: Jiangjie Gao <gaojiangjie@live.com>
> ---
>  libavformat/rtsp.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c
> index 9a2933346e..29ee0b317f 100644
> --- a/libavformat/rtsp.c
> +++ b/libavformat/rtsp.c
> @@ -2510,8 +2510,9 @@ static int rtp_read_header(AVFormatContext *s)
>      if (!ff_network_init())
>          return AVERROR(EIO);
> 
> +    AVDictionary *opts = map_to_opts(rt);

there will be build warning, we need to declare variable at the beginning.
also see warning at https://patchwork.ffmpeg.org/project/ffmpeg/list/?series=3458
Moritz Barsnick March 4, 2021, 10:25 a.m. UTC | #2
On Thu, Mar 04, 2021 at 15:38:56 +0800, gaojiangjie@live.com wrote:

> Subject: avformat/rtsp: fix https://trac.ffmpeg.org/ticket/7517

Please write what you actually do in the first line summary of the commit
message, and mention the trac ticket in the body.

> +    AVDictionary *opts = map_to_opts(rt);
>      ret = ffurl_open_whitelist(&in, s->url, AVIO_FLAG_READ,
> -                     &s->interrupt_callback, NULL, s->protocol_whitelist, s->protocol_blacklist, NULL);
> +                     &s->interrupt_callback, &opts, s->protocol_whitelist, s->protocol_blacklist, NULL);
>      if (ret)
>          goto fail;

map_to_opts() requires a corresponding av_dict_free().

Moritz
diff mbox series

Patch

diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c
index 9a2933346e..29ee0b317f 100644
--- a/libavformat/rtsp.c
+++ b/libavformat/rtsp.c
@@ -2510,8 +2510,9 @@  static int rtp_read_header(AVFormatContext *s)
     if (!ff_network_init())
         return AVERROR(EIO);
 
+    AVDictionary *opts = map_to_opts(rt);
     ret = ffurl_open_whitelist(&in, s->url, AVIO_FLAG_READ,
-                     &s->interrupt_callback, NULL, s->protocol_whitelist, s->protocol_blacklist, NULL);
+                     &s->interrupt_callback, &opts, s->protocol_whitelist, s->protocol_blacklist, NULL);
     if (ret)
         goto fail;