base

Merge change I24b0a95d into eclair-mr2

* changes:
  The original delay after which we dropped a frame was too aggressive. 40ms lateness seems more appropriate (about 25fps).