Merge commit '23915ddde9ce3ed9f1ce50ea321c8fdce612faf0' * commit '23915ddde9ce3ed9f1ce50ea321c8fdce612faf0': Don't count empty buffers when computing the frame rate.
Merge commit '23915ddde9ce3ed9f1ce50ea321c8fdce612faf0' * commit '23915ddde9ce3ed9f1ce50ea321c8fdce612faf0': Don't count empty buffers when computing the frame rate.