Skip to content

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

Merge commit 'ca36aa9e' 

* commit 'ca36aa9e':
  codec_desc: set lossless attribute for SGI and DPX

Conflicts:
	libavcodec/codec_desc.c

See: 5b802cf5Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 42138f63 ca36aa9e
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