merge code

@@ -749,4 +749,3 @@ void SrsClient::on_stop()
 	}
 	}
 #endif
 #endif
 }
 }
-

@@ -27,3 +27,4 @@ bool srs_is_system_control_error(int error_code)
 {
 {
 	return error_code == ERROR_CONTROL_RTMP_CLOSE;
 	return error_code == ERROR_CONTROL_RTMP_CLOSE;
 }
 }
+

@@ -3365,4 +3365,3 @@ int SrsUserControlPacket::encode_packet(SrsStream* stream)
 	
 	
 	return ret;
 	return ret;
 }
 }
-

@@ -1226,3 +1226,4 @@ int SrsRtmp::identify_play_client(SrsPlayPacket* req, SrsClientType& type, strin
 
 
 	return ret;
 	return ret;
 }
 }
+