From ad86ea038a0b4803c7e3f1a82a293e2ee538e345 Mon Sep 17 00:00:00 2001 From: Michael Roitzsch Date: Sat, 1 Nov 2003 18:12:53 +0000 Subject: big ffmpeg patch * do not define CONFIG_ENCODERS any more, use a stripped down XINE_MPEG_ENCODER, which will only compile an I-frame-only MPEG1 encoder (speeds up compile time) * fix a lot of warnings in ffmpeg (a good deal of which have already been submitted to the ffmpeg project by Mike) * simplify some Makefiles CVS patchset: 5667 CVS date: 2003/11/01 18:12:53 --- src/libffmpeg/libavcodec/ra288.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/libffmpeg/libavcodec/ra288.c') diff --git a/src/libffmpeg/libavcodec/ra288.c b/src/libffmpeg/libavcodec/ra288.c index b59074822..979be2e7c 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 -- cgit v1.2.3