OSDN Git Service

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)
commite206b51fd377425ec4c4a37160b9753e49809416
tree037945139fd4d08ae4b68a0c504ec677ac2886e8
parenta0340dfbd78df7639715056937011d2d414aaeed
parente6093e3640ab9303523dcd79394cce0e0702238c
Merge remote-tracking branch 'cus/stable'

* cus/stable:
  ffplay: pause rdft column when ffplay is paused

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