diff mbox series

[FFmpeg-devel] avformat/url: Change () position in ff_make_absolute_url()

Message ID 20201216182044.31967-1-michael@niedermayer.cc
State Accepted
Commit ef59a40c2a0df694cf6f23870f94b6e32deabfe1
Headers show
Series [FFmpeg-devel] avformat/url: Change () position in ff_make_absolute_url() | expand

Checks

Context Check Description
andriy/x86_make success Make finished
andriy/x86_make_fate success Make fate finished

Commit Message

Michael Niedermayer Dec. 16, 2020, 6:20 p.m. UTC 
No testcase

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
---
 libavformat/url.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Nicolas George Dec. 16, 2020, 6:29 p.m. UTC | #1 
Michael Niedermayer (12020-12-16):
> No testcase
> 
> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
> ---
>  libavformat/url.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)

Yes, that looks better, thanks.

Regards,
Michael Niedermayer Dec. 16, 2020, 9:42 p.m. UTC | #2 
On Wed, Dec 16, 2020 at 07:29:08PM +0100, Nicolas George wrote:
> Michael Niedermayer (12020-12-16):
> > No testcase
> > 
> > Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
> > ---
> >  libavformat/url.c | 4 ++--
> >  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> Yes, that looks better, thanks.

will apply

thx

[...]
diff mbox series

Patch

diff --git a/libavformat/url.c b/libavformat/url.c
index 6db4b4e1ae..77d610d95f 100644
--- a/libavformat/url.c
+++ b/libavformat/url.c
@@ -211,8 +211,8 @@  int ff_make_absolute_url(char *buf, int size, const char *base,
 
     if (!base)
         base = "";
-    if ((ret = ff_url_decompose(&ub, base, NULL) < 0) ||
-        (ret = ff_url_decompose(&uc, rel,  NULL) < 0))
+    if ((ret = ff_url_decompose(&ub, base, NULL)) < 0 ||
+        (ret = ff_url_decompose(&uc, rel,  NULL)) < 0)
         goto error;
 
     keep = ub.url;