[FFmpeg-cvslog] Merge commit '29b3ca743dd02efbe00565c0b997e735e4daa772' into release/1.1

[Michael Niedermayer]

ffmpeg | branch: release/1.1 | Michael Niedermayer <michaelni at gmx.at> | Mon Apr 21 14:02:06 2014 +0200| [be9074debcfe9e5ea898d2e69a746e5b75cdae84] | committer: Michael Niedermayer

Merge commit '29b3ca743dd02efbe00565c0b997e735e4daa772' into release/1.1

* commit '29b3ca743dd02efbe00565c0b997e735e4daa772':
  drawtext: Drop pointless header

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

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