Skip to content
Snippets Groups Projects
Commit 443261cb authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files

Merge commit 'f1b239ec' 


* commit 'f1b239ec':
  drawtext: Add fontconfig support

Conflicts:
	configure
	doc/filters.texi
	libavfilter/vf_drawtext.c

See: 40b7a27b
Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents c150e2cf f1b239ec
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
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