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

Originally committed as revision 3712 to svn://svn.ffmpeg.org/ffmpeg/trunk
pull/126/head
Jeff Muizelaar 20 years ago committed by Michael Niedermayer
parent a5ddc19f04
commit 21d7e2ff40
  1. 2
      libavcodec/ac3enc.c
  2. 2
      libavcodec/mjpeg.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];

@ -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*/);

Loading…
Cancel
Save