summaryrefslogtreecommitdiff
path: root/libavfilter/vf_framepack.c
Commit message (Collapse)AuthorAge
* Merge commit 'a7d0e7ead95e584c4866617f046b2493066975c6'Michael Niedermayer2014-01-10
| | | | | | | | | | | | | * 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 filterVittorio Giovara2014-01-09