Skip to content

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

Merge commit '327c439f' 

* commit '327c439f':
  timefilter: Handle memory allocation failure

Conflicts:
	libavdevice/jack_audio.c
	libavdevice/timefilter.c

See: 6ef30976Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 6c5f17e7 327c439f
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