[FFmpeg-cvslog] Merge commit 'd68dc3c9446e38b4d686cc0f55433c9e8d7c128b'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Jan  6 17:25:52 2014 +0100| [d1dc0d218423c20b2dd880b28fac97627a3ed7e3] | committer: Michael Niedermayer

Merge commit 'd68dc3c9446e38b4d686cc0f55433c9e8d7c128b'

* commit 'd68dc3c9446e38b4d686cc0f55433c9e8d7c128b':
  drawtext: Drop pointless header

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

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