From 21d7e2ff409383910a2f8b99615ce71d44e77697 Mon Sep 17 00:00:00 2001 From: Jeff Muizelaar Date: Thu, 25 Nov 2004 19:17:27 +0000 Subject: [PATCH] fix some type mismatches patch by (Jeff Muizelaar ) Originally committed as revision 3712 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/ac3enc.c | 2 +- libavcodec/mjpeg.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/ac3enc.c b/libavcodec/ac3enc.c index 78af63b9c9..eb9c8577a1 100644 --- a/libavcodec/ac3enc.c +++ b/libavcodec/ac3enc.c @@ -1359,7 +1359,7 @@ static int AC3_encode_frame(AVCodecContext *avctx, 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 --git a/libavcodec/mjpeg.c b/libavcodec/mjpeg.c index d281b063db..a3743b754d 100644 --- a/libavcodec/mjpeg.c +++ b/libavcodec/mjpeg.c @@ -827,7 +827,7 @@ typedef struct MJpegDecodeContext { 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*/);