[FFmpeg-cvslog] Merge commit '2240e2078d53d3cfce8ff1dda64e58fa72038602'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Feb  5 02:16:20 2014 +0100| [2b88cb2f4653e76ba58848ce2564a22501c9c4e9] | committer: Michael Niedermayer

Merge commit '2240e2078d53d3cfce8ff1dda64e58fa72038602'

* commit '2240e2078d53d3cfce8ff1dda64e58fa72038602':
  truemotion1: check the header size

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

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