Merge remote-tracking branch 'cus/stable'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 28 Mar 2012 00:16:48 +0000 (02:16 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 28 Mar 2012 00:16:56 +0000 (02:16 +0200)
* cus/stable:
  ffplay: pause rdft column when ffplay is paused

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

Trivial merge