Skip to content

F
ffmpeg.wasm-core
Commit 1ddc849b authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files
Options

Merge commit '30be1ea3' 

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

Conflicts:
	libavformat/matroskadec.c

See: c63e76baMerged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents fe540ae6 30be1ea3
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 0 deletions
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment