• Michael Niedermayer's avatar
    Merge remote branch 'qatar/master' · 6d6b0c96
    Michael Niedermayer authored
    * 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: 's avatarMichael Niedermayer <michaelni@gmx.at>
    6d6b0c96
configure 103 KB