am 5884468b: am 1f522294: Merge change I24b0a95d into eclair-mr2

Merge commit '5884468b448a5e2810d2ae421b69cc9c18a1a2f5'

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