diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-22 17:29:34 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-22 17:30:22 +0200 |
| commit | b68e445f9b34eb33a54359340eec66b800269587 (patch) | |
| tree | 876efe0baa8b03a560dcd611f6d0c72a0840cf85 /libavformat/sapenc.c | |
| parent | 05cf687d130a976d96051f6f6bdb63cf724d3709 (diff) | |
| parent | d08d8b61aa9f07d3ea993fe5392f7408c958d221 (diff) | |
| download | ffmpeg-b68e445f9b34eb33a54359340eec66b800269587.tar.gz | |
Merge commit 'd08d8b61aa9f07d3ea993fe5392f7408c958d221'
* commit 'd08d8b61aa9f07d3ea993fe5392f7408c958d221':
dds: Fix 32bpp bitmaps decoding
Conflicts:
libavcodec/dds.c
See: 5c583b141980102530c75d2756b06766742532a1
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavformat/sapenc.c')
0 files changed, 0 insertions, 0 deletions