Commit 9bbb4a98 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '71f29410'

* commit '71f29410':
  lavfi: Increase drawtext font size limits

Conflicts:
	libavfilter/vf_drawtext.c

See: b87d4c2bMerged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents d9a4db65 71f29410
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment