diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-01-10 00:27:56 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-01-10 00:28:15 +0100 |
| commit | 4805a33043e9356fc344aa53c7df747d41ce6b37 (patch) | |
| tree | fc8b2c78b87d1bb616c3b420223cb6c47d5e02b8 /tests | |
| parent | ceb0dd9f1e76a2a2c903fa942e47e8164e0dbedf (diff) | |
| parent | 73f2cf4ed9d61d1fcd06d260a5d3f22131d2fb07 (diff) | |
| download | ffmpeg-4805a33043e9356fc344aa53c7df747d41ce6b37.tar.gz | |
Merge remote-tracking branch 'cus/stable'
* cus/stable:
ffplay: Exit on ctrl-c.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests')
0 files changed, 0 insertions, 0 deletions