Merge commit 'de203abd71baae7f120313259b45cf935c85203e'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 4 Feb 2014 13:33:33 +0000 (14:33 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 4 Feb 2014 13:33:33 +0000 (14:33 +0100)
commit905cd28a5a0be7bb1729d80871369d13a9a598cc
tree5e6b4c754bec3ab109ca6500d208feb433096555
parenta0d5204cd990caf5ed0c6daa37f1b9e638009cad
parentde203abd71baae7f120313259b45cf935c85203e
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>
doc/filters.texi
libavfilter/vf_overlay.c