Skip to content

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

Merge commit 'e75ef2b7' 

* commit 'e75ef2b7':
  tiffdec: support predictor type 2 with RGB48 pixel format

Conflicts:
	libavcodec/tiff.c

See: 72381b2bMerged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents a64d6d51 e75ef2b7
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