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'
This commit is contained in:
Wim Taymans 2006-09-29 08:15:05 +00:00
parent 1a86fdc6e3
commit e8c59d9da3
3 changed files with 12 additions and 4 deletions

View file

@ -1,3 +1,11 @@
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>

View file

@ -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},
};

View file

@ -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;
}