Merge commit '30be1ea33e5525266ad871bed60b1893a53caeaf'

Browse Source

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

Conflicts:
	libavformat/matroskadec.c

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

pull/49/head

Michael Niedermayer 11 years ago

parent fe540ae6b7 30be1ea33e

commit 1ddc849bde

Whitespace

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Split View

Diff Options

Show Stats Download Patch File Download Diff File

Diff Content Not Available