Skip to content

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

Merge commit 'fffca3d2' 

* commit 'fffca3d2':
  4xm: return a proper error code.

Conflicts:
	libavcodec/4xm.c

See: a5e382adMerged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 8d86e7b4 fffca3d2
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