diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-01-06 23:54:26 +0300 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-01-06 23:54:26 +0300 |
| commit | f4cc19cdd082aa07db2f6fd1c5fbc2b674a74a63 (patch) | |
| tree | d47be977ce07848e286869f2c6f35457bd0f0fcb /libavcodec/ffv1dec.c | |
| parent | 90de28befd88fccb2a4d96d55e1d72eac96c4278 (diff) | |
| parent | ca09effb01e126b0ac74ff3de70a475423ddee82 (diff) | |
Merge commit 'ca09effb01e126b0ac74ff3de70a475423ddee82'
* commit 'ca09effb01e126b0ac74ff3de70a475423ddee82':
ffv1: Drop unnecessary casts and const qualifiers to match function signatures
Conflicts:
libavcodec/ffv1dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/ffv1dec.c')
| -rw-r--r-- | libavcodec/ffv1dec.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/ffv1dec.c b/libavcodec/ffv1dec.c index 5fbe51c5a5..b8df7efe8d 100644 --- a/libavcodec/ffv1dec.c +++ b/libavcodec/ffv1dec.c @@ -854,13 +854,13 @@ static av_cold int decode_init(AVCodecContext *avctx) static int 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 *p; if (f->last_picture.f) @@ -938,7 +938,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame, AVPac 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->avctx = avctx; fs->cur = p; @@ -966,7 +966,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame, AVPac src[j] = f->last_picture.f->data[j] + f->last_picture.f->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.f->linesize, avctx->pix_fmt, fs->slice_width, |