# HG changeset patch
# User michael
# Date 1101410247 0
# Node ID c353719836afeb20e5735df9eebf25ee7dc81a4e
# Parent  270666128b07c979fbbdf7f8f59a631e8c4594bd
fix some type mismatches patch by (Jeff Muizelaar <muizelaar rogers com>)

diff -r 270666128b07 -r c353719836af ac3enc.c
--- a/ac3enc.c	Wed Nov 24 22:54:16 2004 +0000
+++ b/ac3enc.c	Thu Nov 25 19:17:27 2004 +0000
@@ -1359,7 +1359,7 @@
                             unsigned char *frame, int buf_size, void *data)
 {
     AC3EncodeContext *s = avctx->priv_data;
-    short *samples = data;
+    int16_t *samples = data;
     int i, j, k, v, ch;
     int16_t input_samples[N];
     int32_t mdct_coef[NB_BLOCKS][AC3_MAX_CHANNELS][N/2];
diff -r 270666128b07 -r c353719836af mjpeg.c
--- a/mjpeg.c	Wed Nov 24 22:54:16 2004 +0000
+++ b/mjpeg.c	Thu Nov 25 19:17:27 2004 +0000
@@ -827,7 +827,7 @@
     int last_dc[MAX_COMPONENTS]; /* last DEQUANTIZED dc (XXX: am I right to do that ?) */
     AVFrame picture; /* picture structure */
     int linesize[MAX_COMPONENTS];                   ///< linesize << interlaced
-    uint8_t *qscale_table;
+    int8_t *qscale_table;
     DCTELEM block[64] __align8;
     ScanTable scantable;
     void (*idct_put)(uint8_t *dest/*align 8*/, int line_size, DCTELEM *block/*align 16*/);