Merge commit 'fe026ba960790a004adfcff33f44f96b05538e5c'
authorHendrik Leppkes <h.leppkes@gmail.com>
Wed, 5 Aug 2015 10:15:41 +0000 (12:15 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Wed, 5 Aug 2015 10:15:41 +0000 (12:15 +0200)
commit4eded225ade30ee92a02a76e644969edbe8f61dc
treef7e3b814bd62ac70daa8667bcbf7580f166c4917
parent00b5c19661857c55b7a727f2f64fdf70cd0b553b
parentfe026ba960790a004adfcff33f44f96b05538e5c
Merge commit 'fe026ba960790a004adfcff33f44f96b05538e5c'

* commit 'fe026ba960790a004adfcff33f44f96b05538e5c':
  drawtext: Drop stray guards

Conflicts:
libavfilter/vf_drawtext.c

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>