diff --git a/libavcodec/ac3dec.c b/libavcodec/ac3dec.c
index 57e9d5c29c4bf99a8fd1244c11ee8073cc9a9f8c..abc70d15dc7646ce40a7b694c2ab04e2108ad7a8 100644
--- a/libavcodec/ac3dec.c
+++ b/libavcodec/ac3dec.c
@@ -88,35 +88,35 @@ static const float slevs[4] = { LEVEL_MINUS_3DB, LEVEL_MINUS_6DB, LEVEL_ZERO, LE
 #define AC3_OUTPUT_LFEON        0x10
 
 typedef struct {
-    uint8_t  acmod;
-    uint8_t  cmixlev;
-    uint8_t  surmixlev;
-    uint8_t  dsurmod;
-
-    uint8_t  blksw[AC3_MAX_CHANNELS];
-    uint8_t  dithflag[AC3_MAX_CHANNELS];
-    uint8_t  cplinu;
-    uint8_t  chincpl[AC3_MAX_CHANNELS];
-    uint8_t  phsflginu;
-    uint8_t  cplbegf;
-    uint8_t  cplendf;
-    uint8_t  cplcoe;
+    int acmod;
+    int cmixlev;
+    int surmixlev;
+    int dsurmod;
+
+    int blksw[AC3_MAX_CHANNELS];
+    int dithflag[AC3_MAX_CHANNELS];
+    int cplinu;
+    int chincpl[AC3_MAX_CHANNELS];
+    int phsflginu;
+    int cplbegf;
+    int cplendf;
+    int cplcoe;
     uint32_t cplbndstrc;
-    uint8_t  rematstr;
-    uint8_t  rematflg[AC3_MAX_CHANNELS];
-    uint8_t  cplexpstr;
-    uint8_t  lfeexpstr;
-    uint8_t  chexpstr[5];
-    uint8_t  csnroffst;
-    uint8_t  cplfsnroffst;
-    uint8_t  cplfgaincod;
-    uint8_t  fsnroffst[5];
-    uint8_t  fgaincod[5];
-    uint8_t  lfefsnroffst;
-    uint8_t  lfefgaincod;
-    uint8_t  cpldeltbae;
-    uint8_t  deltbae[5];
-    uint8_t  cpldeltnseg;
+    int rematstr;
+    int rematflg[AC3_MAX_CHANNELS];
+    int cplexpstr;
+    int lfeexpstr;
+    int chexpstr[5];
+    int csnroffst;
+    int cplfsnroffst;
+    int cplfgaincod;
+    int fsnroffst[5];
+    int fgaincod[5];
+    int lfefsnroffst;
+    int lfefgaincod;
+    int cpldeltbae;
+    int deltbae[5];
+    int cpldeltnseg;
     uint8_t  cpldeltoffst[8];
     uint8_t  cpldeltlen[8];
     uint8_t  cpldeltba[8];