diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-02-04 14:33:33 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-02-04 14:33:33 +0100 |
| commit | 905cd28a5a0be7bb1729d80871369d13a9a598cc (patch) | |
| tree | 5e6b4c754bec3ab109ca6500d208feb433096555 /libavformat/asf.h | |
| parent | a0d5204cd990caf5ed0c6daa37f1b9e638009cad (diff) | |
| parent | de203abd71baae7f120313259b45cf935c85203e (diff) | |
| download | ffmpeg-905cd28a5a0be7bb1729d80871369d13a9a598cc.tar.gz | |
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>
Diffstat (limited to 'libavformat/asf.h')
0 files changed, 0 insertions, 0 deletions