diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2015-11-22 17:12:24 +0000 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2015-11-22 17:12:24 +0000 |
| commit | df8e24be5da2f9a8b0bd86dbbd1b0bf508bac003 (patch) | |
| tree | 367ffc7df37dba1a01b5f15f625a7e14192571b4 /libavcodec/indeo2.c | |
| parent | 5ebaf1e1cbee6097264b594dc66177cc1b6daaf2 (diff) | |
| parent | eda183287489b2c705843aa373a19c4e46fb2fec (diff) | |
| download | ffmpeg-df8e24be5da2f9a8b0bd86dbbd1b0bf508bac003.tar.gz | |
Merge commit 'eda183287489b2c705843aa373a19c4e46fb2fec'
* commit 'eda183287489b2c705843aa373a19c4e46fb2fec':
travis: Enable OSX integration
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'libavcodec/indeo2.c')
0 files changed, 0 insertions, 0 deletions