har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

imgutils: 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:15 -03:00 committed by Michael Niedermayer
parent 4f2549e3d0
commit 94c3e11a6f
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavutil/imgutils.c
View File

@ -296,7 +296,7 @@ int av_image_fill_arrays(uint8_t *dst_data[4], int dst_linesize[4],
if ((ret = av_image_fill_pointers(dst_data, pix_fmt, width, NULL, dst_linesize)) < 0) if ((ret = av_image_fill_pointers(dst_data, pix_fmt, width, NULL, dst_linesize)) < 0)
return ret; return ret;
return av_image_fill_pointers(dst_data, pix_fmt, height, src, dst_linesize); return av_image_fill_pointers(dst_data, pix_fmt, height, (uint8_t *)src, dst_linesize);
} }
int av_image_get_buffer_size(enum PixelFormat pix_fmt, int width, int height, int align) int av_image_get_buffer_size(enum PixelFormat pix_fmt, int width, int height, int align)
@ -340,7 +340,7 @@ int av_image_copy_to_buffer(uint8_t *dst, int dst_size,
} }
if (desc->flags & PIX_FMT_PAL) { if (desc->flags & PIX_FMT_PAL) {
uint32_t *d32 = (uint8_t *)(((size_t)dst + 3) & ~3); uint32_t *d32 = (uint32_t *)(((size_t)dst + 3) & ~3);
for (i = 0; i<256; i++) for (i = 0; i<256; i++)
AV_WL32(d32 + i, AV_RN32(src_data[1] + 4*i)); AV_WL32(d32 + i, AV_RN32(src_data[1] + 4*i));
} }