mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2024-09-19 21:06:42 +00:00
Merge commit 'd08d8b61aa9f07d3ea993fe5392f7408c958d221'
* commit 'd08d8b61aa9f07d3ea993fe5392f7408c958d221':
dds: Fix 32bpp bitmaps decoding
Conflicts:
libavcodec/dds.c
See: 5c583b1419
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
commit
b68e445f9b