diff options
| author | Jeff Muizelaar <jrmuizel@gmail.com> | 2004-11-25 19:17:27 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2004-11-25 19:17:27 +0000 |
| commit | 21d7e2ff409383910a2f8b99615ce71d44e77697 (patch) | |
| tree | ee768b8eff19226d15480fac420b0db1bc40edc4 | |
| parent | a5ddc19f04872b3295346db713756f2807cd7022 (diff) | |
| download | ffmpeg-21d7e2ff409383910a2f8b99615ce71d44e77697.tar.gz | |
fix some type mismatches patch by (Jeff Muizelaar <muizelaar rogers com>)
Originally committed as revision 3712 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavcodec/ac3enc.c | 2 | ||||
| -rw-r--r-- | 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*/); |