Merge remote-tracking branch 'cus/stable'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 16 Sep 2012 22:40:55 +0000 (00:40 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 16 Sep 2012 22:41:07 +0000 (00:41 +0200)
* cus/stable:
  ffplay: dont wait 100ms if data is not yet ready

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

Trivial merge