Skip to content

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

Merge commit '083cbc93' 

* commit '083cbc93':
  snappy: Refactor so ff_snappy_uncompress() uses an existing buffer

Conflicts:
	libavcodec/hapdec.c
	libavcodec/snappy.c

See: 17ee24afMerged-by: 's avatarMichael Niedermayer <michael@niedermayer.cc>
parents 8eff61fd 083cbc93
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