The branch 2.0 has been updated
       via  f69aadbc42d1943376abe00fe1dd5a40801051d7 (commit)
       via  6cc0ac81b11caa005fc782cc16036e852f5590db (commit)
       via  ae45f0adc9fb48c9ccf9cb1422fc4ee72b216d39 (commit)
      from  a71be6e5dd64d5aff05fd2be155b07be0089365d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit f69aadbc42d1943376abe00fe1dd5a40801051d7
Merge: 6cc0ac81b11caa005fc782cc16036e852f5590db 
a71be6e5dd64d5aff05fd2be155b07be0089365d
Author: Luca Barbato <[email protected]>
Date:   Tue Mar 10 23:47:08 2009 +0100

    Merge branch '2.0' of [email protected]:feng into 2.0

commit 6cc0ac81b11caa005fc782cc16036e852f5590db
Merge: ae45f0adc9fb48c9ccf9cb1422fc4ee72b216d39 
f7a814eefee22c6b86aeb90fc3f6cf9c0fca5c1b
Author: Luca Barbato <[email protected]>
Date:   Tue Mar 10 23:42:08 2009 +0100

    Merge branch '2.0' of [email protected]:feng into 2.0

commit ae45f0adc9fb48c9ccf9cb1422fc4ee72b216d39
Author: Luca Barbato <[email protected]>
Date:   Tue Mar 10 23:30:18 2009 +0100

    Reorder OPTIONS



Summary of changes:
 src/network/rtsp_options.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/network/rtsp_options.c b/src/network/rtsp_options.c
index f418edb..3568554 100644
--- a/src/network/rtsp_options.c
+++ b/src/network/rtsp_options.c
@@ -39,7 +39,7 @@ static int send_options_reply(RTSP_buffer * rtsp)
     GString *reply = rtsp_generate_ok_response(rtsp->rtsp_cseq, 0);
 
     g_string_append(reply,
-                   "Public: 
OPTIONS,DESCRIBE,SETUP,PLAY,PAUSE,TEARDOWN,SET_PARAMETER" RTSP_EL);
+                   "Public: DESCRIBE, SETUP, TEARDOWN, PLAY, PAUSE, OPTIONS, 
SET_PARAMETER" RTSP_EL);
     g_string_append(reply, RTSP_EL);
 
     bwrite(reply, rtsp);


hooks/post-receive
--
Standard Streaming Server
_______________________________________________
Lscube-commits mailing list
[email protected]
http://lscube.org/mailman/listinfo/lscube-commits

Reply via email to