[FFmpeg-devel] [PATCH 1/4] libavcodec/hap: Name enums, remove unused struct member

[Tom Butterworth]

---
 libavcodec/hap.h | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/libavcodec/hap.h b/libavcodec/hap.h
index bd0fd37..f36d09a 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 */
 
@@ -50,16 +61,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 */
-- 
2.3.2 (Apple Git-55)