diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-10 22:26:01 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-10 22:27:20 +0200 |
| commit | e434ddd4c6997aa6185d9dbb781faa2421258f04 (patch) | |
| tree | c3a30fd8e1b68ed937980a84326e8e033bac55c7 /doc/codecs.texi | |
| parent | 8bdb119197ad50a5ede2326e3c0942dc82ba1b5e (diff) | |
| parent | 9087eaf193b8ce99c41352064a81916fa66adb49 (diff) | |
| download | ffmpeg-e434ddd4c6997aa6185d9dbb781faa2421258f04.tar.gz | |
Merge commit '9087eaf193b8ce99c41352064a81916fa66adb49'
* commit '9087eaf193b8ce99c41352064a81916fa66adb49':
vf_overlay: switch to an AVOptions-based system.
Conflicts:
doc/filters.texi
libavfilter/vf_overlay.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/codecs.texi')
0 files changed, 0 insertions, 0 deletions