aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/imgconvert.c
diff options
context:
space:
mode:
authorBaptiste Coudurier <baptiste.coudurier@gmail.com>2008-01-31 00:00:08 +0000
committerBaptiste Coudurier <baptiste.coudurier@gmail.com>2008-01-31 00:00:08 +0000
commite151e272a0769ed57c64c0ddd6c859c8fe18bbbf (patch)
tree14944c42a5df6e17c735e4ad0e879752e0ebdadf /libavcodec/imgconvert.c
parent29e15adc3410bff4ce6cce5ba53364554685656f (diff)
downloadffmpeg-e151e272a0769ed57c64c0ddd6c859c8fe18bbbf.tar.gz
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
Diffstat (limited to 'libavcodec/imgconvert.c')
-rw-r--r--libavcodec/imgconvert.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/imgconvert.c b/libavcodec/imgconvert.c
index 229a3a3a0c..c99ece2c8e 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++){