« Previous | Next » 

Revision 6d6b0c96

ID6d6b0c96fdc576f4643e3d4066e5ebebdb693ade
Parent 732ff29b, 994de197
Child b3d5a4b0

Added by Michael Niedermayer about 9 years ago

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 <>

Files

  • added
  • modified
  • copied
  • renamed
  • deleted