Goal: make the current demo work based on VLC master+additional patches.

No additional feature or refactor required.