diff options
| author | jamal <jamrial@gmail.com> | 2012-07-27 05:23:16 -0300 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-07-27 12:27:21 +0200 |
| commit | cb40d360749a5f991cc3e0fd24889e2eaf051905 (patch) | |
| tree | 47606bdd74595a71d9274282a65000d4ee632911 /libavcodec/ffv1.c | |
| parent | 236ecc3502e35b4f513c19c542075dc5737a4633 (diff) | |
ffv1: Fix warnings about incompatible pointer type and discarded qualifiers
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/ffv1.c')
| -rw-r--r-- | libavcodec/ffv1.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/ffv1.c b/libavcodec/ffv1.c index 6d44df0b3b..f00e2477ae 100644 --- a/libavcodec/ffv1.c +++ b/libavcodec/ffv1.c @@ -2047,7 +2047,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, AVPac if(i){ ff_init_range_decoder(&fs->c, buf_p, v); }else - fs->c.bytestream_end = buf_p + v; + fs->c.bytestream_end = (uint8_t *)(buf_p + v); } avctx->execute(avctx, decode_slice, &f->slice_context[0], NULL, f->slice_count, sizeof(void*)); @@ -2065,7 +2065,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, AVPac src[j] = f->last_picture.data[j] + f->last_picture.linesize[j]* (fs->slice_y>>sv) + (fs->slice_x>>sh); } - av_image_copy(dst, f->picture.linesize, src, f->last_picture.linesize, + av_image_copy(dst, f->picture.linesize, (const uint8_t **)src, f->last_picture.linesize, avctx->pix_fmt, fs->slice_width, fs->slice_height); } } |