Skip to content

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

Merge commit '1c1fbc70' 

* commit '1c1fbc70':
  mjpeg: set color_range

Conflicts:
	libavcodec/mjpegdec.c

See: 2f870e26Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents ca0e6fa7 1c1fbc70
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