summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim-Philipp Müller <tim@centricular.net>2007-06-17 12:35:03 +0000
committerTim-Philipp Müller <tim@centricular.net>2007-06-17 12:35:03 +0000
commitc093c9aa1cb59f089ce2cf4bf9ce2348e9bc1073 (patch)
treeb3042869ce153a0d7f90b372c8d55ed468efae8a
parent9d2c01b5518be7e8f4757d1c60c254bceb014336 (diff)
gst/rtsp/rtspconnection.c: Revert previous commit again, since we are frozen (sorry).
Original commit message from CVS: * gst/rtsp/rtspconnection.c: (rtsp_connection_connect), (rtsp_connection_free): Revert previous commit again, since we are frozen (sorry).
-rw-r--r--ChangeLog6
-rw-r--r--gst/rtsp/rtspconnection.c3
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index bbdc89fd..894f5ddb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2007-06-17 Tim-Philipp Müller <tim at centricular dot net>
+ * gst/rtsp/rtspconnection.c: (rtsp_connection_connect),
+ (rtsp_connection_free):
+ Revert previous commit again, since we are frozen (sorry).
+
+2007-06-17 Tim-Philipp Müller <tim at centricular dot net>
+
Patch by: Peter Kjellerstedt <pkj at axis com>
* gst/rtsp/rtspconnection.c: (rtsp_connection_connect),
diff --git a/gst/rtsp/rtspconnection.c b/gst/rtsp/rtspconnection.c
index e8c1ceec..f96caf4d 100644
--- a/gst/rtsp/rtspconnection.c
+++ b/gst/rtsp/rtspconnection.c
@@ -264,7 +264,7 @@ rtsp_connection_connect (RTSPConnection * conn, GTimeVal * timeout)
done:
conn->fd = fd;
- conn->ip = g_strdup (ip);
+ conn->ip = ip;
return RTSP_OK;
@@ -1030,7 +1030,6 @@ rtsp_connection_free (RTSPConnection * conn)
g_timer_destroy (conn->timer);
g_free (conn->username);
g_free (conn->passwd);
- g_free (conn->ip);
g_free (conn);