Merge remote branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 8 May 2011 01:29:51 +0000 (03:29 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 8 May 2011 01:29:51 +0000 (03:29 +0200)
commit6d6b0c96fdc576f4643e3d4066e5ebebdb693ade
tree3689102a30dc0676ec66f3363afa70aa2824d12e
parent732ff29bff1b42c9471d7aa699efae6ffd1b5d61
parent994de197c0d5dcf38d5ab68f8f03f37a890a4458
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>
configure