* commit '58c95448':
  smacker: pad the extradata allocation

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