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)
commite99f324c143a2d825b2be260cb6a799dbfe97a10
treeab05a337bab6dc0813445ece7bab027250d53ef0
parent6c655b40eaceb77a8f4a8f32775db969935de746
parent58c95448e42d34910b939363949ba1a92c06b0b0
Merge commit '58c95448e42d34910b939363949ba1a92c06b0b0'

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

Conflicts:
libavformat/smacker.c

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