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)
commit83438a0db3c61f06979d1c4159e5c85d52eda488
treee2f396838b231df9c36adc6aed4eda731d9babb5
parenta593f5bd9db642801fad5ca535a1d843e8f27e86
parentd8f8e911bd5efbd02dd34e9c5097df6828f4c603
Merge remote-tracking branch 'cus/stable'

* cus/stable:
  ffplay: dont wait 100ms if data is not yet ready

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