virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

ffv1: Fix warnings about incompatible pointer type and discarded qualifiers

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
jamal
2012-07-27 05:23:16 -03:00
committed by Michael Niedermayer
parent 236ecc3502
commit cb40d36074
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/ffv1.c
View File

@@ -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
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);
} }
} }