Merge from 1.1

1 files changed, 7 insertions, 7 deletions

diff --git a/src/input/librtsp/rtsp.c b/src/input/librtsp/rtsp.c
index c8c5c4126..0e65d97d7 100644
--- a/src/input/librtsp/rtsp.c
+++ b/src/input/librtsp/rtsp.c
@@ -175,7 +175,7 @@ static void rtsp_send_request(rtsp_t *s, const char *type, const char *what) {
   char **payload=s->scheduled;
   char *buf;
 
-  asprintf(&buf,"%s %s %s",type, what, rtsp_protocol_version);
+  buf = _x_asprintf("%s %s %s",type, what, rtsp_protocol_version);
   rtsp_put(s,buf);
 
   if (payload)
@@ -200,7 +200,7 @@ static void rtsp_schedule_standard(rtsp_t *s) {
 
   if (s->session) {
     char *buf;
-    asprintf(&buf, "Session: %s", s->session);
+    buf = _x_asprintf("Session: %s", s->session);
     rtsp_schedule_field(s, buf);
   }
 }
@@ -296,7 +296,7 @@ int rtsp_request_options(rtsp_t *s, const char *what) {
     buf=strdup(what);
   } else
   {
-    asprintf(&buf,"rtsp://%s:%i", s->host, s->port);
+    buf = _x_asprintf("rtsp://%s:%i", s->host, s->port);
   }
   rtsp_send_request(s,"OPTIONS",buf);
   free(buf);
@@ -312,7 +312,7 @@ int rtsp_request_describe(rtsp_t *s, const char *what) {
     buf=strdup(what);
   } else
   {
-    asprintf(&buf,"rtsp://%s:%i/%s", s->host, s->port, s->path);
+    buf = _x_asprintf("rtsp://%s:%i/%s", s->host, s->port, s->path);
   }
   rtsp_send_request(s,"DESCRIBE",buf);
   free(buf);
@@ -335,7 +335,7 @@ int rtsp_request_setparameter(rtsp_t *s, const char *what) {
     buf=strdup(what);
   } else
   {
-    asprintf(&buf,"rtsp://%s:%i/%s", s->host, s->port, s->path);
+    buf = _x_asprintf("rtsp://%s:%i/%s", s->host, s->port, s->path);
   }
   rtsp_send_request(s,"SET_PARAMETER",buf);
   free(buf);
@@ -351,7 +351,7 @@ int rtsp_request_play(rtsp_t *s, const char *what) {
     buf=strdup(what);
   } else
   {
-    asprintf(&buf,"rtsp://%s:%i/%s", s->host, s->port, s->path);
+    buf = _x_asprintf("rtsp://%s:%i/%s", s->host, s->port, s->path);
   }
   rtsp_send_request(s,"PLAY",buf);
   free(buf);
@@ -402,7 +402,7 @@ int rtsp_read_data(rtsp_t *s, void *buffer_gen, unsigned int size) {
       }
       /* lets make the server happy */
       rtsp_put(s, "RTSP/1.0 451 Parameter Not Understood");
-      asprintf(&rest,"CSeq: %u", seq);
+      rest = _x_asprintf("CSeq: %u", seq);
       rtsp_put(s, rest);
       free(rest);
       rtsp_put(s, "");