diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-03-30 20:15:21 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-03-30 20:17:51 +0200 |
| commit | 830702546780b63dba8324e89397f64242aa3e61 (patch) | |
| tree | 8f142e051bba67d38a2810886734a65c2a44328c /libavcodec/mjpegdec.c | |
| parent | 03757d488fc110b79e75be51d5f6fac1d4cdf4ef (diff) | |
| download | ffmpeg-830702546780b63dba8324e89397f64242aa3e61.tar.gz | |
mjpegdec: Fix "assignment from incompatible pointer type" warnings
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mjpegdec.c')
| -rw-r--r-- | libavcodec/mjpegdec.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c index 0df0b27137..b0f6fdf0fd 100644 --- a/libavcodec/mjpegdec.c +++ b/libavcodec/mjpegdec.c @@ -862,7 +862,7 @@ static int ljpeg_decode_yuv_scan(MJpegDecodeContext *s, int predictor, pred &= (-1)<<(8-s->bits); *ptr= pred + (dc << point_transform); }else{ - ptr16 = s->picture.data[c] + 2*(linesize * (v * mb_y + y)) + 2*(h * mb_x + x); //FIXME optimize this crap + ptr16 = (uint16_t*)(s->picture.data[c] + 2*(linesize * (v * mb_y + y)) + 2*(h * mb_x + x)); //FIXME optimize this crap if(y==0 && toprow){ if(x==0 && leftcol){ pred= 1 << (bits - 1); @@ -918,7 +918,7 @@ static int ljpeg_decode_yuv_scan(MJpegDecodeContext *s, int predictor, pred &= (-1)<<(8-s->bits); *ptr = pred + (dc << point_transform); }else{ - ptr16 = s->picture.data[c] + 2*(linesize * (v * mb_y + y)) + 2*(h * mb_x + x); //FIXME optimize this crap + ptr16 = (uint16_t*)(s->picture.data[c] + 2*(linesize * (v * mb_y + y)) + 2*(h * mb_x + x)); //FIXME optimize this crap PREDICT(pred, ptr16[-linesize-1], ptr16[-linesize], ptr16[-1], predictor); pred &= (-1)<<(16-s->bits); |