projects
/
platform
/
upstream
/
gstreamer.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
aa26116
)
rtsp: Update the initial_buffer when merging RTSP Connections
author
Ognyan Tonchev
<ognyan@axis.com>
Tue, 10 Jul 2012 09:34:47 +0000
(11:34 +0200)
committer
Wim Taymans
<wim.taymans@collabora.co.uk>
Tue, 10 Jul 2012 09:34:47 +0000
(11:34 +0200)
See https://bugzilla.gnome.org/show_bug.cgi?id=679337
gst-libs/gst/rtsp/gstrtspconnection.c
patch
|
blob
|
history
diff --git
a/gst-libs/gst/rtsp/gstrtspconnection.c
b/gst-libs/gst/rtsp/gstrtspconnection.c
index
2041259
..
fd2cbdf
100644
(file)
--- a/
gst-libs/gst/rtsp/gstrtspconnection.c
+++ b/
gst-libs/gst/rtsp/gstrtspconnection.c
@@
-2864,6
+2864,11
@@
gst_rtsp_connection_do_tunnel (GstRTSPConnection * conn,
conn->read_socket = conn->socket1;
conn->tstate = TUNNEL_STATE_COMPLETE;
+
+ g_free (conn->initial_buffer);
+ conn->initial_buffer = conn2->initial_buffer;
+ conn2->initial_buffer = NULL;
+ conn->initial_buffer_offset = conn2->initial_buffer_offset;
}
/* we need base64 decoding for the readfd */