Merge from 1.2 tip.

--HG--
rename : src/combined/ffmpeg/ff_dvaudio_decoder.c => src/audio_dec/ff_dvaudio_decoder.c

1 files changed, 0 insertions, 23 deletions

diff --git a/src/input/http_helper.c b/src/input/http_helper.c
index 83562c9dc..f4950a084 100644
--- a/src/input/http_helper.c
+++ b/src/input/http_helper.c
@@ -220,29 +220,6 @@ error:
   return 0;  
 }
 
-char *_x_canonicalise_url (const char *base, const char *url) {
-
-  size_t base_length;
-  char *cut, *ret;
-
-  if ((cut = strstr (url, "://")))
-    return strdup (url);
-
-  cut = strstr (base, "://");
-  if (url[0] == '/') {
-    /* absolute - base up to first '/' after "://", then url */
-    cut = strchr (cut + 3, '/');
-  }
-  else {
-    /* relative - base up to & inc. last '/', then url */
-    cut = strrchr (cut, '/');
-    if (cut)
-      ++cut;
-  }
-  base_length = cut ? (size_t)(cut - base) : strlen (base);
-  asprintf (&ret, "%.*s%s", (int)base_length, base, url);
-  return ret;
-}
 
 #ifdef TEST_URL
 /*