[FFmpeg-cvslog] Merge commit 'de203abd71baae7f120313259b45cf935c85203e'
Michael Niedermayer
git at videolan.org
Tue Feb 4 15:08:25 CET 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Feb 4 14:33:33 2014 +0100| [905cd28a5a0be7bb1729d80871369d13a9a598cc] | committer: Michael Niedermayer
Merge commit 'de203abd71baae7f120313259b45cf935c85203e'
* commit 'de203abd71baae7f120313259b45cf935c85203e':
vf_overlay: add eof_action switch
Conflicts:
doc/filters.texi
libavfilter/vf_overlay.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=905cd28a5a0be7bb1729d80871369d13a9a598cc
---
More information about the ffmpeg-cvslog
mailing list