diff options
author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-05-09 15:52:05 +0100 |
---|---|---|
committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-05-09 16:25:28 +0100 |
commit | ca5ec2bf51d8c4f8bb0a829d0a65c70c968888a3 (patch) | |
tree | a1a466cd3186398946e522ecac62ef1e2d85d1b2 /libavfilter/af_join.c | |
parent | 1a3cff4f7eadad5292b6d65f751b0273d3a4124a (diff) | |
parent | 01621202aad7e27b2a05c71d9ad7a19dfcbe17ec (diff) | |
download | ffmpeg-streaming-ca5ec2bf51d8c4f8bb0a829d0a65c70c968888a3.zip ffmpeg-streaming-ca5ec2bf51d8c4f8bb0a829d0a65c70c968888a3.tar.gz |
Merge commit '01621202aad7e27b2a05c71d9ad7a19dfcbe17ec'
* commit '01621202aad7e27b2a05c71d9ad7a19dfcbe17ec':
build: miscellaneous cosmetics
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'libavfilter/af_join.c')
0 files changed, 0 insertions, 0 deletions