diff options
| author | Nicolas George <george@nsup.org> | 2016-12-20 15:49:17 +0100 |
|---|---|---|
| committer | Nicolas George <george@nsup.org> | 2017-01-12 14:06:16 +0100 |
| commit | 846f1421349e923b100ce290ba25b5b5b897b437 (patch) | |
| tree | 6fcfd703334f0519d85a751da48acb8e86efdfa8 /presets | |
| parent | 28c62df672865890cbb13e5f0e94bde29c8fbacd (diff) | |
| download | ffmpeg-846f1421349e923b100ce290ba25b5b5b897b437.tar.gz | |
lavfi: merge two variables after a recent commit.
Diffstat (limited to 'presets')
0 files changed, 0 insertions, 0 deletions