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

Michael Niedermayer git at videolan.org
Thu Dec 31 01:06:13 EET 2020


ffmpeg | branch: release/4.3 | Michael Niedermayer <michael at niedermayer.cc> | Wed Dec 16 19:15:12 2020 +0100| [8f3741a5e39f492a499121f14251e94edf398717] | committer: Marton Balint

avformat/url: Change () position in ff_make_absolute_url()

No testcase
Reviewed-by: Nicolas George <george at nsup.org>
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
(cherry picked from commit ef59a40c2a0df694cf6f23870f94b6e32deabfe1)

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8f3741a5e39f492a499121f14251e94edf398717
---

 libavformat/url.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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;



More information about the ffmpeg-cvslog mailing list