Skip to content

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

Merge commit 'f354f308' 

* commit 'f354f308':
  error resilience: check error_concealment, not err_recognition.

Conflicts:
	libavcodec/error_resilience.c

See: 346e0963Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 0436ffc2 f354f308
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