Merge commit 'a7d0e7ead95e584c4866617f046b2493066975c6'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 10 Jan 2014 01:53:15 +0000 (02:53 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 10 Jan 2014 02:00:48 +0000 (03:00 +0100)
commit402a411406854d20b3f3ab105185ccff7f6cd9ff
tree0aa0b313eb532f5276e6048ea331b6df8e909493
parent3b8299c1e1c72fdd4284d88e7d426bd35689acd3
parenta7d0e7ead95e584c4866617f046b2493066975c6
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>
Changelog
doc/filters.texi
libavfilter/Makefile
libavfilter/allfilters.c
libavfilter/version.h
libavfilter/vf_framepack.c