diff options
| author | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2008-01-31 00:01:16 +0000 |
|---|---|---|
| committer | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2008-01-31 00:01:16 +0000 |
| commit | 7f4d2d830800ab650c56973253de7482545ef838 (patch) | |
| tree | f8eef757f32ff87b960207c9e4016c9acad8ee94 /libavcodec/4xm.c | |
| parent | e151e272a0769ed57c64c0ddd6c859c8fe18bbbf (diff) | |
| download | ffmpeg-7f4d2d830800ab650c56973253de7482545ef838.tar.gz | |
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
Diffstat (limited to 'libavcodec/4xm.c')
| -rw-r--r-- | libavcodec/4xm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/4xm.c b/libavcodec/4xm.c index 72c8dbf9dd..dbcf47a2fb 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); |