diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-01-05 15:55:40 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-01-05 15:55:47 +0100 |
| commit | 0e1c827e842c0a86eb32de853162d97e214e2b23 (patch) | |
| tree | ee95c80b2ba25b45a0ed8184bcb9620a2ce5e721 /libavfilter/aeval.c | |
| parent | c9151de7c42553bb145be608df8513c1287f1f24 (diff) | |
| parent | 91bdb244009c7d33d547bf7901ef1ae4538a51df (diff) | |
| download | ffmpeg-0e1c827e842c0a86eb32de853162d97e214e2b23.tar.gz | |
Merge remote-tracking branch 'origin/master'
* origin/master:
libavfilter/vf_blend: do not unconditionally compile both filters
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/aeval.c')
0 files changed, 0 insertions, 0 deletions