Merge change I94856f6d into eclair

* changes:
  Update <video> implementation after new IRC discussion with Eric Carlsson.