aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/ra288.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2004-05-18 17:09:46 +0000
committerMichael Niedermayer <michaelni@gmx.at>2004-05-18 17:09:46 +0000
commite96682e6f4c1fbddf468f9f051729332163c1db9 (patch)
tree6365d37b821ceb5e03f282ebf660f9f014903fca /libavcodec/ra288.c
parent12cccabd0fedca3846f1381971aaffd30374bede (diff)
downloadffmpeg-e96682e6f4c1fbddf468f9f051729332163c1db9.tar.gz
some of the warning fixes by (Michael Roitzsch <mroi at users dot sourceforge dot net>)
Originally committed as revision 3140 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/ra288.c')
-rw-r--r--libavcodec/ra288.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/ra288.c b/libavcodec/ra288.c
index a44eb96f14..09ecc7aacb 100644
--- a/libavcodec/ra288.c
+++ b/libavcodec/ra288.c
@@ -206,7 +206,7 @@ static void prodsum(float *tgt, float *src, int len, int n)
}
}
-void * decode_block(AVCodecContext * avctx, unsigned char *in, signed short int *out,unsigned len)
+static void * decode_block(AVCodecContext * avctx, unsigned char *in, signed short int *out,unsigned len)
{
int x,y;
Real288_internal *glob=avctx->priv_data;
@@ -255,7 +255,7 @@ static int ra288_decode_frame(AVCodecContext * avctx,
data=decode_block(avctx,&buf[j*cfs+cfs*i*h/2],(signed short *)data,cfs);
bret += cfs;
}
- *data_size = data - datao;
+ *data_size = (char *)data - (char *)datao;
return bret;
}
else