From: Michael Niedermayer <michaelni@gmx.at>
Date: Wed, 28 Mar 2012 00:16:48 +0000 (+0200)
Subject: Merge remote-tracking branch 'cus/stable'
X-Git-Tag: android-x86-4.4-r1~12713
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=e206b51fd377425ec4c4a37160b9753e49809416;p=android-x86%2Fexternal-ffmpeg.git

Merge remote-tracking branch 'cus/stable'

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

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

e206b51fd377425ec4c4a37160b9753e49809416