Merge remote-tracking branch 'cus/stable'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 24 Oct 2011 23:03:10 +0000 (01:03 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 24 Oct 2011 23:03:20 +0000 (01:03 +0200)
* cus/stable:
  ffplay: add frame drop statistics
  ffplay: consider estimated time of filter in early frame drop
  ffplay: reimplement early frame drop

Merged-by: Michael Niedermayer <michaelni@gmx.at>

Trivial merge