Merge remote-tracking branch 'qatar/master'

[ffmpeg] / libavcodec / vc1.h

diff --git a/libavcodec/vc1.h b/libavcodec/vc1.h
index 0f185309ba93731a7a043770fa4aa896cb41c900..0c9032fe5c6cd0f01cc3a66c974efbe0bd769556 100644 (file)
--- a/libavcodec/vc1.h
+++ b/libavcodec/vc1.h
@@ -28,6 +28,8 @@
 #include "intrax8.h"
 #include "vc1dsp.h"
 
+#define AC_VLC_BITS 9
+
 /** Markers used in VC-1 AP frame data */
 //@{
 enum VC1Code {
@@ -347,7 +349,7 @@ typedef struct VC1Context{
     uint8_t fourmvbp;
     uint8_t* fieldtx_plane;
     int fieldtx_is_raw;
-    int8_t zzi_8x8[64];
+    uint8_t zzi_8x8[64];
     uint8_t *blk_mv_type_base, *blk_mv_type;    ///< 0: frame MV, 1: field MV (interlaced frame)
     uint8_t *mv_f_base, *mv_f[2];               ///< 0: MV obtained from same field, 1: opposite field
     uint8_t *mv_f_last_base, *mv_f_last[2];