[FFmpeg-cvslog] hap: Name enums, remove unused struct member
Tom Butterworth
git at videolan.org
Thu Jul 23 18:44:24 CEST 2015
ffmpeg | branch: master | Tom Butterworth <bangnoise at gmail.com> | Tue Jul 21 01:21:39 2015 +0100| [11f3d5c69b711a1f1631961921ecd20d31f8336d] | committer: Vittorio Giovara
hap: Name enums, remove unused struct member
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=11f3d5c69b711a1f1631961921ecd20d31f8336d
---
libavcodec/hap.h | 25 ++++++++++++-------------
1 file changed, 12 insertions(+), 13 deletions(-)
diff --git a/libavcodec/hap.h b/libavcodec/hap.h
index e06f933..a0fc2e0 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 */
More information about the ffmpeg-cvslog
mailing list