Merge commit '71f29410e7c58f2ce4aef1d4b8d8d3c064c8ec06'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 8 Dec 2014 00:34:28 +0000 (01:34 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 8 Dec 2014 00:34:55 +0000 (01:34 +0100)
commit9bbb4a98fe53953f8e23d4f7ca1a0fdb7d0b5a77
tree9da5be2285c231ec6b3162fa8afb5336aa86440f
parentd9a4db657dcee1b18976d44c11567d3ac4fd0d83
parent71f29410e7c58f2ce4aef1d4b8d8d3c064c8ec06
Merge commit '71f29410e7c58f2ce4aef1d4b8d8d3c064c8ec06'

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

Conflicts:
libavfilter/vf_drawtext.c

See: b87d4c2b9f4106045afeabe1f1338c3eddb66935
Merged-by: Michael Niedermayer <michaelni@gmx.at>