diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-10 02:53:15 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-10 03:00:48 +0100 |
| commit | 402a411406854d20b3f3ab105185ccff7f6cd9ff (patch) | |
| tree | 0aa0b313eb532f5276e6048ea331b6df8e909493 /libavfilter/af_amix.c | |
| parent | 3b8299c1e1c72fdd4284d88e7d426bd35689acd3 (diff) | |
| parent | a7d0e7ead95e584c4866617f046b2493066975c6 (diff) | |
| download | ffmpeg-402a411406854d20b3f3ab105185ccff7f6cd9ff.tar.gz | |
Merge commit 'a7d0e7ead95e584c4866617f046b2493066975c6'
* commit 'a7d0e7ead95e584c4866617f046b2493066975c6':
lavfi: add framepack filter
Conflicts:
Changelog
doc/filters.texi
libavfilter/allfilters.c
libavfilter/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/af_amix.c')
0 files changed, 0 insertions, 0 deletions