Merge commit '710b0e27025948b7511821c2f888ff2d74a59e14'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 12 Sep 2013 09:38:55 +0000 (11:38 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 12 Sep 2013 09:39:18 +0000 (11:39 +0200)
* commit '710b0e27025948b7511821c2f888ff2d74a59e14':
  smacker: Avoid integer overflow when allocating packets

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavformat/smacker.c

Simple merge