[FFmpeg-cvslog] Merge remote branch 'qatar/master'

Michael Niedermayer git at videolan.org
Sun May 8 03:38:48 CEST 2011


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun May  8 03:29:51 2011 +0200| [6d6b0c96fdc576f4643e3d4066e5ebebdb693ade] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6d6b0c96fdc576f4643e3d4066e5ebebdb693ade
---





More information about the ffmpeg-cvslog mailing list