Merge commit '71f29410e7c58f2ce4aef1d4b8d8d3c064c8ec06'

Browse Source

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

Conflicts:
	libavfilter/vf_drawtext.c

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

...

This commit is contained in:

Michael Niedermayer 2014-12-08 01:34:28 +01:00

parent d9a4db657d 71f29410e7

commit 9bbb4a98fe

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available