diff options
| author | Nicolas George <george@nsup.org> | 2020-07-30 00:02:10 +0200 |
|---|---|---|
| committer | Nicolas George <george@nsup.org> | 2020-08-12 16:45:21 +0200 |
| commit | 1201687da268c11459891a80ca1972aeaca8db88 (patch) | |
| tree | 957a7fa03127b4ba83ed810b8eccb0532dfda5f6 /libavformat/url.h | |
| parent | d853293679f93ef882e6a5f1c47eb5a65ceddf3d (diff) | |
| download | ffmpeg-1201687da268c11459891a80ca1972aeaca8db88.tar.gz | |
lavf/url: rewrite ff_make_absolute_url() using ff_url_decompose().
Also add and update some tests.
Change the semantic a little, because for filesytem paths
symlinks complicate things.
See the comments in the code for detail.
Fix trac tickets #8813 and 8814.
Diffstat (limited to 'libavformat/url.h')
| -rw-r--r-- | libavformat/url.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/url.h b/libavformat/url.h index ae27da5c73..e33edf0cb9 100644 --- a/libavformat/url.h +++ b/libavformat/url.h @@ -312,8 +312,8 @@ int ff_url_join(char *str, int size, const char *proto, * @param base the base url, may be equal to buf. * @param rel the new url, which is interpreted relative to base */ -void ff_make_absolute_url(char *buf, int size, const char *base, - const char *rel); +int ff_make_absolute_url(char *buf, int size, const char *base, + const char *rel); /** * Allocate directory entry with default values. |