changeset 25:2f603eb2f23d libavcodec

types fix
author glantau
date Mon, 06 Aug 2001 00:47:50 +0000
parents 08265a63313e
children ce751dfbcace
files ac3enc.c mpeg12data.h msmpeg4.c
diffstat 3 files changed, 7 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/ac3enc.c	Mon Aug 06 00:47:03 2001 +0000
+++ b/ac3enc.c	Mon Aug 06 00:47:50 2001 +0000
@@ -599,7 +599,7 @@
         s->mant2_cnt = 0;
         s->mant4_cnt = 0;
         for(ch=0;ch<s->nb_channels;ch++) {
-            parametric_bit_allocation(s, bap[i][ch], encoded_exp[i][ch], 
+            parametric_bit_allocation(s, bap[i][ch], (INT8 *)encoded_exp[i][ch], 
                                       0, s->nb_coefs[ch], 
                                       (((csnroffst-15) << 4) + 
                                        fsnroffst) << 2, 
--- a/mpeg12data.h	Mon Aug 06 00:47:03 2001 +0000
+++ b/mpeg12data.h	Mon Aug 06 00:47:50 2001 +0000
@@ -127,7 +127,7 @@
   {0x06,4}, /* EOB */
 };
 
-static const UINT8 mpeg1_level[111] = {
+static const INT8 mpeg1_level[111] = {
   1,  2,  3,  4,  5,  6,  7,  8,
   9, 10, 11, 12, 13, 14, 15, 16,
  17, 18, 19, 20, 21, 22, 23, 24,
@@ -144,7 +144,7 @@
   1,  1,  1,  1,  1,  1,  1,
 };
 
-static const UINT8 mpeg1_run[111] = {
+static const INT8 mpeg1_run[111] = {
   0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,
--- a/msmpeg4.c	Mon Aug 06 00:47:03 2001 +0000
+++ b/msmpeg4.c	Mon Aug 06 00:47:50 2001 +0000
@@ -361,10 +361,10 @@
 
 /* dir = 0: left, dir = 1: top prediction */
 static int msmpeg4_pred_dc(MpegEncContext * s, int n, 
-                           UINT16 **dc_val_ptr, int *dir_ptr)
+                           INT16 **dc_val_ptr, int *dir_ptr)
 {
     int a, b, c, x, y, wrap, pred, scale;
-    UINT16 *dc_val;
+    INT16 *dc_val;
 
     /* find prediction */
     if (n < 4) {
@@ -417,7 +417,7 @@
 {
     int sign, code;
     int pred;
-    UINT16 *dc_val;
+    INT16 *dc_val;
 
     pred = msmpeg4_pred_dc(s, n, &dc_val, dir_ptr);
 
@@ -863,7 +863,7 @@
 static int msmpeg4_decode_dc(MpegEncContext * s, int n, int *dir_ptr)
 {
     int level, pred;
-    UINT16 *dc_val;
+    INT16 *dc_val;
 
     if (n < 4) {
         level = get_vlc(&s->gb, &dc_lum_vlc[s->dc_table_index]);