Merge remote-tracking branch 'cus/stable'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 6 Nov 2012 03:02:36 +0000 (04:02 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 6 Nov 2012 03:02:42 +0000 (04:02 +0100)
* cus/stable:
  ffplay: adjust external clock speed based on buffer fullness for realtime sources

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

Trivial merge