[FFmpeg-cvslog] Merge commit 'ec772cca60423b9994fe00c7cef239f93eae6112' into release/0.10

[Michael Niedermayer]

ffmpeg | branch: release/0.10 | Michael Niedermayer <michaelni at gmx.at> | Tue Jun  3 00:54:33 2014 +0200| [e771425e985efd140474c2bc93333da6de14edee] | committer: Michael Niedermayer

Merge commit 'ec772cca60423b9994fe00c7cef239f93eae6112' into release/0.10

* commit 'ec772cca60423b9994fe00c7cef239f93eae6112':
  drawtext: Drop pointless header
  configure: Support preprocessor macros as header names

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e771425e985efd140474c2bc93333da6de14edee
---