Skip to content

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

Merge commit '58bc38a5' 

* commit '58bc38a5':
  tiffdec: use correct data type for palette entries and set alpha to 0xFF

Conflicts:
	libavcodec/tiff.c

See: dbfdb288Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 6145b1d9 58bc38a5
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