Merge commit '58c95448e42d34910b939363949ba1a92c06b0b0'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 16 Jun 2013 22:44:32 +0000 (00:44 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 16 Jun 2013 22:44:32 +0000 (00:44 +0200)
* commit '58c95448e42d34910b939363949ba1a92c06b0b0':
  smacker: pad the extradata allocation

Conflicts:
libavformat/smacker.c

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

Simple merge