diff --git a/libavcodec/ffv1dec.c b/libavcodec/ffv1dec.c index 50b220ff07..4349af571a 100644 --- a/libavcodec/ffv1dec.c +++ b/libavcodec/ffv1dec.c @@ -827,13 +827,13 @@ static av_cold int ffv1_decode_init(AVCodecContext *avctx) static int ffv1_decode_frame(AVCodecContext *avctx, void *data, int *got_frame, AVPacket *avpkt) { - const uint8_t *buf = avpkt->data; + uint8_t *buf = avpkt->data; int buf_size = avpkt->size; FFV1Context *f = avctx->priv_data; RangeCoder *const c = &f->slice_context[0]->c; int i, ret; uint8_t keystate = 128; - const uint8_t *buf_p; + uint8_t *buf_p; AVFrame *const p = data; f->cur = p; @@ -895,7 +895,7 @@ static int ffv1_decode_frame(AVCodecContext *avctx, void *data, if (i) { ff_init_range_decoder(&fs->c, buf_p, v); } else - fs->c.bytestream_end = (uint8_t *)(buf_p + v); + fs->c.bytestream_end = buf_p + v; fs->cur = p; } @@ -919,7 +919,7 @@ static int ffv1_decode_frame(AVCodecContext *avctx, void *data, f->last_picture->linesize[j] * (fs->slice_y >> sv) + (fs->slice_x >> sh); } - av_image_copy(dst, p->linesize, (const uint8_t **)src, + av_image_copy(dst, p->linesize, src, f->last_picture->linesize, avctx->pix_fmt, fs->slice_width, fs->slice_height);