Merge commit '5b5338f6d1272526d2634501555cbaff4cdfb87b'

* commit '5b5338f6d1272526d2634501555cbaff4cdfb87b':
  hqx: Implement slice-threaded decoding

Conflicts:
	libavcodec/hqx.c
	libavcodec/hqx.h

See: eff72a6c7375587a3280ddf59e6e26a4907823b7
Merged-by: Michael Niedermayer <michaelni@gmx.at>

1 files changed, 8 insertions, 12 deletions

diff --git a/libavcodec/hqx.h b/libavcodec/hqx.h
index 486afcfd17..42d382de1f 100644
--- a/libavcodec/hqx.h
+++ b/libavcodec/hqx.h
@@ -49,21 +49,19 @@ typedef struct HQXAC {
     const HQXLUT *lut;
 } HQXAC;
 
-
-typedef struct HQXSliceData
-{
-    DECLARE_ALIGNED(16, int16_t, block)[16][64];
-    GetBitContext gb;
-
-} HQXSliceData;
-
 struct HQXContext;
-typedef int (*mb_decode_func)(struct HQXContext *ctx, HQXSliceData * slice_data,
-                              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;
@@ -71,8 +69,6 @@ typedef struct HQXContext {
     int format, dcb, width, height;
     int interlaced;
 
-    HQXSliceData slice[17];
-
     uint8_t *src;
     unsigned int data_size;
     uint32_t slice_off[17];