Keeping branch current, and fixing libvlc compile issues

Important this does not provide video storage for libvlc, but has functions in place to allow it in the future and to get branch compiling again.