Merge branch 'master' into 0.11

This commit is contained in:
Sebastian Dröge 2011-05-17 11:27:12 +02:00
commit 2df213fe25

View file

@ -2270,7 +2270,7 @@ gst_rtsp_connection_receive (GstRTSPConnection * conn, GstRTSPMessage * message,
goto socket_error;
/* once we start reading the wait cannot be controlled */
if (builder.state != STATE START)
if (builder.state != STATE_START)
gst_poll_set_controllable (conn->fdset, FALSE);
}