summaryrefslogtreecommitdiff
path: root/libavcodec/hqx.h
diff options
context:
space:
mode:
Diffstat (limited to 'libavcodec/hqx.h')
-rw-r--r--libavcodec/hqx.h11
1 files changed, 8 insertions, 3 deletions
diff --git a/libavcodec/hqx.h b/libavcodec/hqx.h
index 7e3fd6a3be..7f329712fd 100644
--- a/libavcodec/hqx.h
+++ b/libavcodec/hqx.h
@@ -51,10 +51,17 @@ typedef struct HQXAC {
struct HQXContext;
-typedef int (*mb_decode_func)(struct HQXContext *ctx, GetBitContext *gb, int x, int y);
+typedef int (*mb_decode_func)(struct HQXContext *ctx,
+ int slice_no, int x, int y);
+
+typedef struct HQXSlice {
+ GetBitContext gb;
+ DECLARE_ALIGNED(16, int16_t, block)[16][64];
+} HQXSlice;
typedef struct HQXContext {
HQXDSPContext hqxdsp;
+ HQXSlice slice[16];
AVFrame *pic;
mb_decode_func decode_func;
@@ -66,8 +73,6 @@ typedef struct HQXContext {
unsigned int data_size;
uint32_t slice_off[17];
- DECLARE_ALIGNED(16, int16_t, block)[16][64];
-
VLC cbp_vlc;
VLC dc_vlc[3];
} HQXContext;