diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-22 17:13:38 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-22 17:14:24 +0200 |
| commit | eaf15bba03b4067cb56b704ebc2e0b36a501ef22 (patch) | |
| tree | 876efe0baa8b03a560dcd611f6d0c72a0840cf85 /libavcodec/dds.c | |
| parent | 6b9be608ce926ff2f858936e2aac4115400887cc (diff) | |
| parent | ea4d46e72945cba37feb7aa154eb970732f513e4 (diff) | |
| download | ffmpeg-eaf15bba03b4067cb56b704ebc2e0b36a501ef22.tar.gz | |
Merge commit 'ea4d46e72945cba37feb7aa154eb970732f513e4'
* commit 'ea4d46e72945cba37feb7aa154eb970732f513e4':
dds: Fix enum declaration
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec/dds.c')
| -rw-r--r-- | libavcodec/dds.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/dds.c b/libavcodec/dds.c index 93f340d04b..a01ed7d297 100644 --- a/libavcodec/dds.c +++ b/libavcodec/dds.c @@ -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; |