Video: Fixes #207.

Also refactored the code to change the way the data for each provider is handled.