[FFmpeg-cvslog] Merge commit 'a7d0e7ead95e584c4866617f046b2493066975c6'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Jan 10 02:53:15 2014 +0100| [402a411406854d20b3f3ab105185ccff7f6cd9ff] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=402a411406854d20b3f3ab105185ccff7f6cd9ff
---