git.videolan.org
/
ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(from parent 1:
e151e27
)
cast to dest type, fix warning: 4xm.c:304: warning: initialization from incompatible...
author
Baptiste Coudurier
<baptiste.coudurier@gmail.com>
Thu, 31 Jan 2008 00:01:16 +0000
(
00:01
+0000)
committer
Baptiste Coudurier
<baptiste.coudurier@gmail.com>
Thu, 31 Jan 2008 00:01:16 +0000
(
00:01
+0000)
Originally committed as revision 11676 to svn://svn.ffmpeg.org/ffmpeg/trunk
libavcodec/4xm.c
patch
|
blob
|
history
diff --git
a/libavcodec/4xm.c
b/libavcodec/4xm.c
index
72c8dbf
..
dbcf47a
100644
(file)
--- 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);