Commit ca09effb authored by Diego Biurrun's avatar Diego Biurrun Committed by Vittorio Giovara

ffv1: Drop unnecessary casts and const qualifiers to match function signatures

libavcodec/ffv1dec.c:898:36: warning: cast discards ‘const’ qualifier from pointer target type
parent 1dd797e3
...@@ -827,13 +827,13 @@ static av_cold int ffv1_decode_init(AVCodecContext *avctx) ...@@ -827,13 +827,13 @@ static av_cold int ffv1_decode_init(AVCodecContext *avctx)
static int ffv1_decode_frame(AVCodecContext *avctx, void *data, static int ffv1_decode_frame(AVCodecContext *avctx, void *data,
int *got_frame, AVPacket *avpkt) int *got_frame, AVPacket *avpkt)
{ {
const uint8_t *buf = avpkt->data; uint8_t *buf = avpkt->data;
int buf_size = avpkt->size; int buf_size = avpkt->size;
FFV1Context *f = avctx->priv_data; FFV1Context *f = avctx->priv_data;
RangeCoder *const c = &f->slice_context[0]->c; RangeCoder *const c = &f->slice_context[0]->c;
int i, ret; int i, ret;
uint8_t keystate = 128; uint8_t keystate = 128;
const uint8_t *buf_p; uint8_t *buf_p;
AVFrame *const p = data; AVFrame *const p = data;
f->cur = p; f->cur = p;
...@@ -895,7 +895,7 @@ static int ffv1_decode_frame(AVCodecContext *avctx, void *data, ...@@ -895,7 +895,7 @@ static int ffv1_decode_frame(AVCodecContext *avctx, void *data,
if (i) { if (i) {
ff_init_range_decoder(&fs->c, buf_p, v); ff_init_range_decoder(&fs->c, buf_p, v);
} else } else
fs->c.bytestream_end = (uint8_t *)(buf_p + v); fs->c.bytestream_end = buf_p + v;
fs->cur = p; fs->cur = p;
} }
...@@ -919,7 +919,7 @@ static int ffv1_decode_frame(AVCodecContext *avctx, void *data, ...@@ -919,7 +919,7 @@ static int ffv1_decode_frame(AVCodecContext *avctx, void *data,
f->last_picture->linesize[j] * f->last_picture->linesize[j] *
(fs->slice_y >> sv) + (fs->slice_x >> sh); (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, f->last_picture->linesize,
avctx->pix_fmt, fs->slice_width, avctx->pix_fmt, fs->slice_width,
fs->slice_height); fs->slice_height);
......
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