Merge commit 'b88cc5cca111132b42c2ee99662bfefe7652e3da'

[ffmpeg] / libavcodec / huffyuv.h

diff --git a/libavcodec/huffyuv.h b/libavcodec/huffyuv.h
index da4e3b5a132adde1393cd7c286993f07194fdbe1..dc413a418cbfaf2a7170022555b84a39fa232006 100644 (file)
--- a/libavcodec/huffyuv.h
+++ b/libavcodec/huffyuv.h
@@ -34,27 +34,17 @@
 #include "avcodec.h"
 #include "dsputil.h"
 #include "get_bits.h"
+#include "huffyuvdsp.h"
+#include "huffyuvencdsp.h"
 #include "put_bits.h"
 #include "lossless_videodsp.h"
 
-#define VLC_BITS 11
+#define VLC_BITS 12
 
 #define MAX_BITS 16
 #define MAX_N (1<<MAX_BITS)
 #define MAX_VLC_N 16384
 
-#if HAVE_BIGENDIAN
-#define B 3
-#define G 2
-#define R 1
-#define A 0
-#else
-#define B 0
-#define G 1
-#define R 2
-#define A 3
-#endif
-
 typedef enum Predictor {
     LEFT = 0,
     PLANE,
@@ -95,6 +85,8 @@ typedef struct HYuvContext {
     uint8_t *bitstream_buffer;
     unsigned int bitstream_buffer_size;
     DSPContext dsp;
+    HuffYUVDSPContext hdsp;
+    HuffYUVEncDSPContext hencdsp;
     LLVidDSPContext llviddsp;
 } HYuvContext;