Skip to content

F
ffmpeg.wasm-core
Commit cb40d360 authored by jamal's avatar jamal Committed by Michael Niedermayer
Browse files
Options

ffv1: Fix warnings about incompatible pointer type and discarded qualifiers 

Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent 236ecc35
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
libavcodec/ffv1.c
View file @ cb40d360
...@@ -2047,7 +2047,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, AVPac ...@@ -2047,7 +2047,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, AVPac
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 = 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*)); 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 ...@@ -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]* src[j] = f->last_picture.data[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, 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); avctx->pix_fmt, fs->slice_width, 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