Stream video from ubuntu server to Android device

view story

http://askubuntu.com – I have a ubuntu 12.04 headless server. I got alot of video on the server. Most of it is in x264 in .mkv. I have a samsung nexus phone, and a nexus 7 tablet. Whats my options when it comes to streaming from the ubuntu server to android? I got smb up and running. Some friends of mine was talking about DLNA, the "playstation media server" could be a solution? (HowTos)