[SCM] libav/experimental: cast to dest type, fix warning imgconvert.c:1958: warning: assignment from incompatible pointer type

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 16:12:37 UTC 2013


The following commit has been merged in the experimental branch:
commit e151e272a0769ed57c64c0ddd6c859c8fe18bbbf
Author: Baptiste Coudurier <baptiste.coudurier at gmail.com>
Date:   Thu Jan 31 00:00:08 2008 +0000

    cast to dest type, fix warning imgconvert.c:1958: warning: assignment from incompatible pointer type
    
    Originally committed as revision 11675 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/imgconvert.c b/libavcodec/imgconvert.c
index 229a3a3..c99ece2 100644
--- a/libavcodec/imgconvert.c
+++ b/libavcodec/imgconvert.c
@@ -1901,9 +1901,9 @@ static void gray16_to_gray16(AVPicture *dst, const AVPicture *src,
 {
     int x, y, src_wrap, dst_wrap;
     uint16_t *s, *d;
-    s = src->data[0];
+    s = (uint16_t*)src->data[0];
     src_wrap = (src->linesize[0] - width * 2)/2;
-    d = dst->data[0];
+    d = (uint16_t*)dst->data[0];
     dst_wrap = (dst->linesize[0] - width * 2)/2;
     for(y=0; y<height; y++){
         for(x=0; x<width; x++){

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list