Merge commit 'ec772cca60423b9994fe00c7cef239f93eae6112' into release/0.10
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 2 Jun 2014 22:54:33 +0000 (00:54 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 2 Jun 2014 22:54:37 +0000 (00:54 +0200)
* commit 'ec772cca60423b9994fe00c7cef239f93eae6112':
  drawtext: Drop pointless header
  configure: Support preprocessor macros as header names

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
configure
libavfilter/vf_drawtext.c

diff --cc configure
Simple merge
Simple merge