Skip to content

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

Merge commit 'e0010bb9' 

* commit 'e0010bb9':
  mux: Do not leave stale side data pointers in ff_interleave_add_packet()

Conflicts:
	libavformat/mux.c

See: bfb3ed1aMerged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 0318013a e0010bb9
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