diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-01 04:24:25 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-01 04:52:20 +0200 |
| commit | 6537b89843e227b5d78a9832ba66781465edb81b (patch) | |
| tree | 11b48f725a1f3583d1c4b9a86cbbe91a779965d1 /ffplay.c | |
| parent | 767b1daf4b6a40e34ebe2a18f328074babfd8bd1 (diff) | |
| parent | 55c6e59906ab51dd7fd1290e502f26802516f8c7 (diff) | |
| download | ffmpeg-6537b89843e227b5d78a9832ba66781465edb81b.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
fate: add SGI tests
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffplay.c')
0 files changed, 0 insertions, 0 deletions