use dc tables from msmpeg4 instead of duplicating them patch by anonymous

[ffmpeg] / libavcodec / ra288.c

diff --git a/libavcodec/ra288.c b/libavcodec/ra288.c
index a44eb96f14471c875e05a24d5ab936d302a33037..4cff3106e5e2e68752e91cc6fc5b9466d03789fe 100644 (file)
--- a/libavcodec/ra288.c
+++ b/libavcodec/ra288.c
@@ -47,7 +47,7 @@ static void colmult(float *tgt, float *m1, const float *m2, int n);
 
 
 /* initial decode */
-static void unpack(unsigned short *tgt, unsigned char *src, int len)
+static void unpack(unsigned short *tgt, unsigned char *src, unsigned int len)
 {
   int x,y,z;
   int n,temp;
@@ -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