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)
commit61b1805f73f8ab2214ad2ae6ba6bb8c7d84aca91
tree7292a6db287dccc21c0b2808d5ee45b21cccaf0a
parentf0a7b67a356def037d26f9460b22c86d82be2b89
parentd54af906a4e6fcc5e5cac456f5d5912bdb292a67
Merge remote-tracking branch 'cus/stable'

* 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>