diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-04-21 20:20:58 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-04-21 20:20:58 +0200 |
| commit | 122150168f7d2a1bdc5c208505366d1a9e9c3892 (patch) | |
| tree | 3b0284c9b73dab38877cbe16072a56cbf530de44 /libavfilter/vf_blend.c | |
| parent | 77e794908b18c9598ed3937af00e74c01014bbd9 (diff) | |
| parent | 9b2c57bef5e2f3f61a5fd708ba7d5351f5b3f386 (diff) | |
| download | ffmpeg-122150168f7d2a1bdc5c208505366d1a9e9c3892.tar.gz | |
Merge commit '9b2c57bef5e2f3f61a5fd708ba7d5351f5b3f386'
* commit '9b2c57bef5e2f3f61a5fd708ba7d5351f5b3f386':
drawtext: Add an alpha option
Conflicts:
doc/filters.texi
libavfilter/vf_drawtext.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/vf_blend.c')
0 files changed, 0 insertions, 0 deletions