ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Mon Dec 8
01:34:28 2014 +0100| [9bbb4a98fe53953f8e23d4f7ca1a0fdb7d0b5a77] | committer:
Michael Niedermayer
Merge commit '71f29410e7c58f2ce4aef1d4b8d8d3c064c8ec06'
* commit '71f29410e7c58f2ce4aef1d4b8d8d3c064c8ec06':
lavfi: Increase drawtext font size limits
Conflicts:
libavfilter/vf_drawtext.c
See: b87d4c2b9f4106045afeabe1f1338c3eddb66935
Merged-by: Michael Niedermayer <michae...@gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9bbb4a98fe53953f8e23d4f7ca1a0fdb7d0b5a77
---
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
