diff options
| author | Wim Taymans <wim.taymans@gmail.com> | 2006-09-29 08:15:05 +0000 |
|---|---|---|
| committer | Wim Taymans <wim.taymans@gmail.com> | 2006-09-29 08:15:05 +0000 |
| commit | e8c59d9da35e716049f89ce213f374556997e9df (patch) | |
| tree | e089d791cbd9c1d152b11dc277b7b00cffd1ac50 | |
| parent | 1a86fdc6e370be3eae6592176f20d919dd1d66d2 (diff) | |
gst/rtsp/gstrtspsrc.c: Fix flag registration.
Original commit message from CVS:
* gst/rtsp/gstrtspsrc.c: (gst_rtsp_proto_get_type):
Fix flag registration.
* gst/rtsp/rtspconnection.c: (rtsp_connection_read):
Reading 0 also means 'no more commands'
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | gst/rtsp/gstrtspsrc.c | 6 | ||||
| -rw-r--r-- | gst/rtsp/rtspconnection.c | 2 |
3 files changed, 12 insertions, 4 deletions
@@ -1,5 +1,13 @@ 2006-09-29 Wim Taymans <wim@fluendo.com> + * gst/rtsp/gstrtspsrc.c: (gst_rtsp_proto_get_type): + Fix flag registration. + + * gst/rtsp/rtspconnection.c: (rtsp_connection_read): + Reading 0 also means 'no more commands' + +2006-09-29 Wim Taymans <wim@fluendo.com> + Patch by: Antoine Tremblay <hexa00 at gmail dot com> * gst/udp/gstudpsrc.c: (gst_udpsrc_create): diff --git a/gst/rtsp/gstrtspsrc.c b/gst/rtsp/gstrtspsrc.c index 506e563b..0631bbed 100644 --- a/gst/rtsp/gstrtspsrc.c +++ b/gst/rtsp/gstrtspsrc.c @@ -140,9 +140,9 @@ gst_rtsp_proto_get_type (void) { static GType rtsp_proto_type = 0; static const GFlagsValue rtsp_proto[] = { - {GST_RTSP_PROTO_UDP_UNICAST, "UDP Unicast", "UDP unicast mode"}, - {GST_RTSP_PROTO_UDP_MULTICAST, "UDP Multicast", "UDP Multicast mode"}, - {GST_RTSP_PROTO_TCP, "TCP", "TCP interleaved mode"}, + {GST_RTSP_PROTO_UDP_UNICAST, "UDP Unicast Mode", "udp-unicast"}, + {GST_RTSP_PROTO_UDP_MULTICAST, "UDP Multicast Mode", "udp-multicast"}, + {GST_RTSP_PROTO_TCP, "TCP interleaved mode", "tcp"}, {0, NULL, NULL}, }; diff --git a/gst/rtsp/rtspconnection.c b/gst/rtsp/rtspconnection.c index 019fdfeb..e939a55d 100644 --- a/gst/rtsp/rtspconnection.c +++ b/gst/rtsp/rtspconnection.c @@ -522,7 +522,7 @@ rtsp_connection_read (RTSPConnection * conn, gpointer data, guint size) int res; READ_COMMAND (conn, command, res); - if (res < 0) { + if (res <= 0) { /* no more commands */ break; } |