Skip to content

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

Merge commit 'd08d8b61' 

* commit 'd08d8b61':
  dds: Fix 32bpp bitmaps decoding

Conflicts:
	libavcodec/dds.c

See: 5c583b14Merged-by: 's avatarMichael Niedermayer <michael@niedermayer.cc>
parents 05cf687d d08d8b61
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