Merge commit '2240e2078d53d3cfce8ff1dda64e58fa72038602'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 5 Feb 2014 01:16:20 +0000 (02:16 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 5 Feb 2014 01:25:34 +0000 (02:25 +0100)
* commit '2240e2078d53d3cfce8ff1dda64e58fa72038602':
  truemotion1: check the header size

See: e7b43e8e84e48fccf64cdc62430cb8b5c69e804c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/truemotion1.c

Simple merge