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)
* commit 'fe026ba960790a004adfcff33f44f96b05538e5c':
  drawtext: Drop stray guards

Conflicts:
libavfilter/vf_drawtext.c

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

Trivial merge