[FFmpeg-cvslog] Merge commit '30be1ea33e5525266ad871bed60b1893a53caeaf'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Nov 22 12:02:50 2013 +0100| [1ddc849bde0da856eef9a7f1b5b877941bd82ae4] | committer: Michael Niedermayer

Merge commit '30be1ea33e5525266ad871bed60b1893a53caeaf'

* commit '30be1ea33e5525266ad871bed60b1893a53caeaf':
  matroskadec: pad EBML_BIN data.

Conflicts:
	libavformat/matroskadec.c

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

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