Skip to content

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

Merge commit '68e95ab8' 

* commit '68e95ab8':
  dnxhdenc: return meaningful return codes

Conflicts:
	libavcodec/dnxhdenc.c

See: b9bedb0bMerged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents ce0ec108 68e95ab8
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