ffmpeg | branch: master | Hendrik Leppkes <h.lepp...@gmail.com> | Wed Aug 5
12:15:41 2015 +0200| [4eded225ade30ee92a02a76e644969edbe8f61dc] | committer:
Hendrik Leppkes
Merge commit 'fe026ba960790a004adfcff33f44f96b05538e5c'
* commit 'fe026ba960790a004adfcff33f44f96b05538e5c':
drawtext: Drop stray guards
Conflicts:
libavfilter/vf_drawtext.c
Merged-by: Hendrik Leppkes <h.lepp...@gmail.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4eded225ade30ee92a02a76e644969edbe8f61dc
---
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
