diff options
author | Tom Butterworth <bangnoise@gmail.com> | 2015-07-21 01:21:39 +0100 |
---|---|---|
committer | Vittorio Giovara <vittorio.giovara@gmail.com> | 2015-07-23 13:35:16 +0100 |
commit | 11f3d5c69b711a1f1631961921ecd20d31f8336d (patch) | |
tree | 2eb94ac800977ed31146759bd239a30cb4c1b918 /libavcodec | |
parent | 083cbc930d077651ea7e3fbc32ec45352cfed7e7 (diff) | |
download | ffmpeg-11f3d5c69b711a1f1631961921ecd20d31f8336d.tar.gz |
hap: Name enums, remove unused struct member
Diffstat (limited to 'libavcodec')
-rw-r--r-- | libavcodec/hap.h | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/libavcodec/hap.h b/libavcodec/hap.h index e06f933ba8..a0fc2e0bf3 100644 --- a/libavcodec/hap.h +++ b/libavcodec/hap.h @@ -29,12 +29,23 @@ #include "bytestream.h" #include "texturedsp.h" +enum HapTextureFormat { + HAP_FMT_RGBDXT1 = 0x0B, + HAP_FMT_RGBADXT5 = 0x0E, + HAP_FMT_YCOCGDXT5 = 0x0F, +}; + +enum HapCompressor { + HAP_COMP_NONE = 0xA0, + HAP_COMP_SNAPPY = 0xB0, + HAP_COMP_COMPLEX = 0xC0, +}; + typedef struct HapContext { AVClass *class; TextureDSPContext dxtc; GetByteContext gbc; - PutByteContext pbc; int section_type; /* Header type */ @@ -52,16 +63,4 @@ typedef struct HapContext { int (*tex_fun)(uint8_t *dst, ptrdiff_t stride, const uint8_t *block); } HapContext; -enum { - HAP_FMT_RGBDXT1 = 0x0B, - HAP_FMT_RGBADXT5 = 0x0E, - HAP_FMT_YCOCGDXT5 = 0x0F, -}; - -enum { - HAP_COMP_NONE = 0xA0, - HAP_COMP_SNAPPY = 0xB0, - HAP_COMP_COMPLEX = 0xC0, -}; - #endif /* AVCODEC_HAP_H */ |