ZoneMinder/ZoneMinder — pull request #618 by SteveGilvarry (2014-12-02 20:56:21+00:00)
Title: Video Highlander

Yes that is right there can only be one. Rather than chop off heads, I have merged the two competing solutions for video storage. This is the raw merge so it will have issues, but I wanted to put this out there and see what people think.
**Issues to be resolved**
- Detect when camera is being recorded as h264 and don't use videoevent code
- Merge two competing UI options into one that works and can be merged to master.
- Fix the FIXME's in videostorage

This will break feature-h264-videostorage branch, but you have to break some eggs to make a cake.