diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-05-08 03:29:51 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-05-08 03:29:51 +0200 |
| commit | 6d6b0c96fdc576f4643e3d4066e5ebebdb693ade (patch) | |
| tree | 3689102a30dc0676ec66f3363afa70aa2824d12e /libavcodec/adpcm.c | |
| parent | 732ff29bff1b42c9471d7aa699efae6ffd1b5d61 (diff) | |
| parent | 994de197c0d5dcf38d5ab68f8f03f37a890a4458 (diff) | |
| download | ffmpeg-6d6b0c96fdc576f4643e3d4066e5ebebdb693ade.tar.gz | |
Merge remote branch 'qatar/master'
* qatar/master:
drawtext: add documentation for the shadow parameters
drawtext: add shadow support.
drawtext: factor draw_glyphs.
drawtext: fix and optimize yuv blend.
drawtext: get rid of divisions in the inner loop.
drawtext: simplify chroma blend and fix chroma alpha.
lavfi: Port drawtext filter by Hemanth from the libavfilter soc repo
Conflicts:
configure
libavfilter/avfilter.h
libavfilter/vf_drawtext.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/adpcm.c')
0 files changed, 0 insertions, 0 deletions