diff options
| author | Michael Roitzsch <mroi@users.sourceforge.net> | 2004-05-30 19:24:17 +0000 |
|---|---|---|
| committer | Michael Roitzsch <mroi@users.sourceforge.net> | 2004-05-30 19:24:17 +0000 |
| commit | df5fbeb013e70f14090cec1998a5f923d6713a1d (patch) | |
| tree | de31c29919f53b88f27bdb7add18706b1b51ddcc /src/libffmpeg/libavcodec/ra288.c | |
| parent | 26de73d1e48ab23af83e352cdc6e9eac41bf8c3b (diff) | |
| download | xine-lib-df5fbeb013e70f14090cec1998a5f923d6713a1d.tar.gz xine-lib-df5fbeb013e70f14090cec1998a5f923d6713a1d.tar.bz2 | |
merge ffmpeg to fix compiler warnings
CVS patchset: 6612
CVS date: 2004/05/30 19:24:17
Diffstat (limited to 'src/libffmpeg/libavcodec/ra288.c')
| -rw-r--r-- | src/libffmpeg/libavcodec/ra288.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libffmpeg/libavcodec/ra288.c b/src/libffmpeg/libavcodec/ra288.c index a44eb96f1..09ecc7aac 100644 --- a/src/libffmpeg/libavcodec/ra288.c +++ b/src/libffmpeg/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 |