Michael Niedermayer 905cd28a5a Merge commit 'de203abd71baae7f120313259b45cf935c85203e'
* commit 'de203abd71baae7f120313259b45cf935c85203e':
  vf_overlay: add eof_action switch

Conflicts:
	doc/filters.texi
	libavfilter/vf_overlay.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-04 14:33:33 +01:00
..
2014-02-02 13:16:28 +01:00
2014-02-02 11:58:23 +01:00
2014-01-27 15:18:18 +01:00
2013-08-29 22:52:04 +02:00