Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge commit 'a7d0e7ead95e584c4866617f046b2493066975c6' | Michael Niedermayer | 2014-01-10 | 1 | -4/+4 |
| | | | | | | | | | | | | | * commit 'a7d0e7ead95e584c4866617f046b2493066975c6': lavfi: add framepack filter Conflicts: Changelog doc/filters.texi libavfilter/allfilters.c libavfilter/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at> | ||||
* | lavfi: add framepack filter | Vittorio Giovara | 2014-01-09 | 1 | -0/+363 |