Merge commit '5b5338f6'

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

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

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

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];