diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2012-03-28 02:16:48 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2012-03-28 02:16:56 +0200 |
commit | e206b51fd377425ec4c4a37160b9753e49809416 (patch) | |
tree | 037945139fd4d08ae4b68a0c504ec677ac2886e8 /tests | |
parent | a0340dfbd78df7639715056937011d2d414aaeed (diff) | |
parent | e6093e3640ab9303523dcd79394cce0e0702238c (diff) | |
download | ffmpeg-e206b51fd377425ec4c4a37160b9753e49809416.tar.gz |
Merge remote-tracking branch 'cus/stable'
* cus/stable:
ffplay: pause rdft column when ffplay is paused
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests')
0 files changed, 0 insertions, 0 deletions