Commit 26a43135 authored by michael's avatar michael

fix some type mismatches patch by (Jeff Muizelaar <muizelaar rogers com>)


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@3712 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent 9ab4982d
...@@ -1359,7 +1359,7 @@ static int AC3_encode_frame(AVCodecContext *avctx, ...@@ -1359,7 +1359,7 @@ static int AC3_encode_frame(AVCodecContext *avctx,
unsigned char *frame, int buf_size, void *data) unsigned char *frame, int buf_size, void *data)
{ {
AC3EncodeContext *s = avctx->priv_data; AC3EncodeContext *s = avctx->priv_data;
short *samples = data; int16_t *samples = data;
int i, j, k, v, ch; int i, j, k, v, ch;
int16_t input_samples[N]; int16_t input_samples[N];
int32_t mdct_coef[NB_BLOCKS][AC3_MAX_CHANNELS][N/2]; int32_t mdct_coef[NB_BLOCKS][AC3_MAX_CHANNELS][N/2];
......
...@@ -827,7 +827,7 @@ typedef struct MJpegDecodeContext { ...@@ -827,7 +827,7 @@ typedef struct MJpegDecodeContext {
int last_dc[MAX_COMPONENTS]; /* last DEQUANTIZED dc (XXX: am I right to do that ?) */ int last_dc[MAX_COMPONENTS]; /* last DEQUANTIZED dc (XXX: am I right to do that ?) */
AVFrame picture; /* picture structure */ AVFrame picture; /* picture structure */
int linesize[MAX_COMPONENTS]; ///< linesize << interlaced int linesize[MAX_COMPONENTS]; ///< linesize << interlaced
uint8_t *qscale_table; int8_t *qscale_table;
DCTELEM block[64] __align8; DCTELEM block[64] __align8;
ScanTable scantable; ScanTable scantable;
void (*idct_put)(uint8_t *dest/*align 8*/, int line_size, DCTELEM *block/*align 16*/); void (*idct_put)(uint8_t *dest/*align 8*/, int line_size, DCTELEM *block/*align 16*/);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment