Browse Source

Merge commit 'ea4d46e72945cba37feb7aa154eb970732f513e4'

* commit 'ea4d46e72945cba37feb7aa154eb970732f513e4':
  dds: Fix enum declaration

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
tags/n2.8
Michael Niedermayer 10 years ago
parent
commit
eaf15bba03
1 changed files with 2 additions and 2 deletions
  1. +2
    -2
      libavcodec/dds.c

+ 2
- 2
libavcodec/dds.c View File

@@ -54,7 +54,7 @@ enum DDSPostProc {
DDS_SWIZZLE_XGBR,
DDS_SWIZZLE_XRBG,
DDS_SWIZZLE_XGXR,
} DDSPostProc;
};

enum DDSDXGIFormat {
DXGI_FORMAT_R16G16B16A16_TYPELESS = 9,
@@ -93,7 +93,7 @@ enum DDSDXGIFormat {
DXGI_FORMAT_B8G8R8A8_UNORM_SRGB = 91,
DXGI_FORMAT_B8G8R8X8_TYPELESS = 92,
DXGI_FORMAT_B8G8R8X8_UNORM_SRGB = 93,
} DDSDXGIFormat;
};

typedef struct DDSContext {
TextureDSPContext texdsp;


Loading…
Cancel
Save