Merge change If0d04246 into eclair-mr2

* changes:
  Don't count empty buffers when computing the frame rate.