Merge commit '30be1ea33e5525266ad871bed60b1893a53caeaf'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 22 Nov 2013 11:02:50 +0000 (12:02 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 22 Nov 2013 11:07:53 +0000 (12:07 +0100)
* commit '30be1ea33e5525266ad871bed60b1893a53caeaf':
  matroskadec: pad EBML_BIN data.

Conflicts:
libavformat/matroskadec.c

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

Trivial merge