[FFmpeg-cvslog] imgutils: Fix warnings about incompatible pointer type and discarded qualifiers

jamal git at videolan.org
Fri Jul 27 22:44:06 CEST 2012


ffmpeg | branch: master | jamal <jamrial at gmail.com> | Fri Jul 27 05:23:15 2012 -0300| [94c3e11a6f62bf13a7e6f1b9287c6112bf6ee445] | committer: Michael Niedermayer

imgutils: Fix warnings about incompatible pointer type and discarded qualifiers

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=94c3e11a6f62bf13a7e6f1b9287c6112bf6ee445
---

 libavutil/imgutils.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavutil/imgutils.c b/libavutil/imgutils.c
index 8ef92a5..67368f0 100644
--- a/libavutil/imgutils.c
+++ b/libavutil/imgutils.c
@@ -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)
         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)
@@ -340,7 +340,7 @@ int av_image_copy_to_buffer(uint8_t *dst, int dst_size,
     }
 
     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++)
             AV_WL32(d32 + i, AV_RN32(src_data[1] + 4*i));
     }



More information about the ffmpeg-cvslog mailing list