Skip to content

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

Merge commit '82f8eb5f' 

* commit '82f8eb5f':
  jpeg2000: split off inverse MCT as Jpeg2000DSP

Conflicts:
	libavcodec/Makefile
	libavcodec/jpeg2000dec.c
	libavcodec/jpeg2000dsp.c
	libavcodec/jpeg2000dsp.h

See: c9f2ec8aMerged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents f3296b94 82f8eb5f
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