[SCM] libav/experimental: cast to dest type, fix warning: 4xm.c:304: warning: initialization from incompatible pointer type

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


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

    cast to dest type, fix warning: 4xm.c:304: warning: initialization from incompatible pointer type
    
    Originally committed as revision 11676 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/4xm.c b/libavcodec/4xm.c
index 72c8dbf..dbcf47a 100644
--- a/libavcodec/4xm.c
+++ b/libavcodec/4xm.c
@@ -301,7 +301,7 @@ static void decode_p_block(FourXContext *f, uint16_t *dst, uint16_t *src, int lo
     const int index= size2index[log2h][log2w];
     const int h= 1<<log2h;
     int code= get_vlc2(&f->gb, block_type_vlc[1-(f->version>1)][index].table, BLOCK_TYPE_VLC_BITS, 1);
-    uint16_t *start= f->last_picture.data[0];
+    uint16_t *start= (uint16_t*)f->last_picture.data[0];
     uint16_t *end= start + stride*(f->avctx->height-h+1) - (1<<log2w);
 
     assert(code>=0 && code<=6);

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list