generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit 'ea4d46e72945cba37feb7aa154eb970732f513e4'

Browse Source 
* commit 'ea4d46e72945cba37feb7aa154eb970732f513e4':
  dds: Fix enum declaration

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2015-07-22 17:13:38 +02:00
commit eaf15bba03
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/dds.c
View File

@ -54,7 +54,7 @@ enum DDSPostProc {
DDS_SWIZZLE_XGBR, DDS_SWIZZLE_XGBR,
DDS_SWIZZLE_XRBG, DDS_SWIZZLE_XRBG,
DDS_SWIZZLE_XGXR, DDS_SWIZZLE_XGXR,
} DDSPostProc; };
enum DDSDXGIFormat { enum DDSDXGIFormat {
DXGI_FORMAT_R16G16B16A16_TYPELESS = 9, DXGI_FORMAT_R16G16B16A16_TYPELESS = 9,
@ -93,7 +93,7 @@ enum DDSDXGIFormat {
DXGI_FORMAT_B8G8R8A8_UNORM_SRGB = 91, DXGI_FORMAT_B8G8R8A8_UNORM_SRGB = 91,
DXGI_FORMAT_B8G8R8X8_TYPELESS = 92, DXGI_FORMAT_B8G8R8X8_TYPELESS = 92,
DXGI_FORMAT_B8G8R8X8_UNORM_SRGB = 93, DXGI_FORMAT_B8G8R8X8_UNORM_SRGB = 93,
} DDSDXGIFormat; };
typedef struct DDSContext { typedef struct DDSContext {
TextureDSPContext texdsp; TextureDSPContext texdsp;