aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/acelp_filters.h
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2011-05-08 03:29:51 +0200
committerMichael Niedermayer <michaelni@gmx.at>2011-05-08 03:29:51 +0200
commit6d6b0c96fdc576f4643e3d4066e5ebebdb693ade (patch)
tree3689102a30dc0676ec66f3363afa70aa2824d12e /libavcodec/acelp_filters.h
parent732ff29bff1b42c9471d7aa699efae6ffd1b5d61 (diff)
parent994de197c0d5dcf38d5ab68f8f03f37a890a4458 (diff)
downloadffmpeg-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/acelp_filters.h')
0 files changed, 0 insertions, 0 deletions