2 Commits

Author	SHA1	Message	Date
Michael Niedermayer	402a411406	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>	2014-01-10 03:00:48 +01:00
Vittorio Giovara	a7d0e7ead9	lavfi: add framepack filter	2014-01-09 23:13:05 +01:00