[FFmpeg-cvslog] Merge commit '58c95448e42d34910b939363949ba1a92c06b0b0'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Jun 17 00:44:32 2013 +0200| [e99f324c143a2d825b2be260cb6a799dbfe97a10] | committer: Michael Niedermayer

Merge commit '58c95448e42d34910b939363949ba1a92c06b0b0'

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

Conflicts:
	libavformat/smacker.c

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

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