vlc | branch: master | Rémi Denis-Courmont <r...@remlab.net> | Sat Oct 15 
13:37:43 2016 +0300| [914cb05a5c5dfabf036313ec21d7a5d972d20a35] | committer: 
Rémi Denis-Courmont

playlist: remove stray #ifdef

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=914cb05a5c5dfabf036313ec21d7a5d972d20a35
---

 modules/demux/playlist/playlist.c | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/modules/demux/playlist/playlist.c 
b/modules/demux/playlist/playlist.c
index cc2602e..58f89ba 100644
--- a/modules/demux/playlist/playlist.c
+++ b/modules/demux/playlist/playlist.c
@@ -255,7 +255,6 @@ char *ProcessMRL(const char *str, const char *base)
     /* TODO: drive-relative path: if (str[0] == '\\') */
 #endif
 
-#ifdef HAVE_OPEN_MEMSTREAM
     /* The base URL is always an URL: it is the URL of the playlist.
      *
      * However it is not always known if the input string is a valid URL, a
@@ -281,19 +280,6 @@ char *ProcessMRL(const char *str, const char *base)
     char *abs = vlc_uri_resolve(base, str);
     free(rel);
     return abs;
-#else
-    if (strstr(str, "://") != NULL)
-        return strdup(str);
-
-    const char *split = strrchr(base, '/');
-    char *abs;
-
-    assert(split != NULL);
-
-    if (asprintf(&abs, "%.*s/%s", (int)(split - base), base, str) == -1)
-        abs = NULL;
-    return abs;
-#endif
 }
 
 /**

_______________________________________________
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

Reply via email to