ffmpeg.patch

tools for dgstation st cuberevo box

diff -urN ffmpeg_org/libavcodec/avcodec.h ffmpeg_dgs/libavcodec/avcodec.h
--- ffmpeg_org/libavcodec/avcodec.h	2008-09-29 20:40:31.000000000 +0900
+++ ffmpeg_dgs/libavcodec/avcodec.h	2008-09-29 20:42:13.000000000 +0900
@@ -2962,9 +2962,10 @@
 /**
  * @deprecated Use the software scaler (swscale) instead.
  */
+#if 0
 attribute_deprecated void img_copy(AVPicture *dst, const AVPicture *src,
               int pix_fmt, int width, int height);
-
+#endif
 /**
  * @deprecated Use the software scaler (swscale) instead.
  */
diff -urN ffmpeg_org/libavcodec/dsputil.h ffmpeg_dgs/libavcodec/dsputil.h
--- ffmpeg_org/libavcodec/dsputil.h	2008-09-29 20:40:31.000000000 +0900
+++ ffmpeg_dgs/libavcodec/dsputil.h	2008-09-29 20:41:41.000000000 +0900
@@ -124,9 +124,9 @@
 typedef void (*h264_biweight_func)(uint8_t *dst, uint8_t *src, int stride, int log2_denom, int weightd, int weights, int offset);
 
 #define DEF_OLD_QPEL(name)\
-void ff_put_        ## name (uint8_t *dst/*align width (8 or 16)*/, uint8_t *src/*align 1*/, int stride);\
-void ff_put_no_rnd_ ## name (uint8_t *dst/*align width (8 or 16)*/, uint8_t *src/*align 1*/, int stride);\
-void ff_avg_        ## name (uint8_t *dst/*align width (8 or 16)*/, uint8_t *src/*align 1*/, int stride);
+static void ff_put_        ## name (uint8_t *dst/*align width (8 or 16)*/, uint8_t *src/*align 1*/, int stride);\
+static void ff_put_no_rnd_ ## name (uint8_t *dst/*align width (8 or 16)*/, uint8_t *src/*align 1*/, int stride);\
+static void ff_avg_        ## name (uint8_t *dst/*align width (8 or 16)*/, uint8_t *src/*align 1*/, int stride);
 
 DEF_OLD_QPEL(qpel16_mc11_old_c)
 DEF_OLD_QPEL(qpel16_mc31_old_c)
diff -urN ffmpeg_org/libavcodec/sh4/dsputil_align.c ffmpeg_dgs/libavcodec/sh4/dsputil_align.c
--- ffmpeg_org/libavcodec/sh4/dsputil_align.c	2008-09-29 20:40:31.000000000 +0900
+++ ffmpeg_dgs/libavcodec/sh4/dsputil_align.c	2008-09-29 20:41:41.000000000 +0900
@@ -272,36 +272,36 @@
 
 #define OP put
 
-DEFFUNC(put,   rnd,o,8,OP_C,avg2)
-DEFFUNC(put,   rnd,x,8,OP_X,avg2)
-DEFFUNC(put,no_rnd,x,8,OP_X,avg2)
-DEFFUNC(put,   rnd,y,8,OP_Y,avg2)
-DEFFUNC(put,no_rnd,y,8,OP_Y,avg2)
+DEFFUNC(put,   rnd,o,8,OP_C,avg32)
+DEFFUNC(put,   rnd,x,8,OP_X,avg32)
+DEFFUNC(put,no_rnd,x,8,OP_X,avg32)
+DEFFUNC(put,   rnd,y,8,OP_Y,avg32)
+DEFFUNC(put,no_rnd,y,8,OP_Y,avg32)
 DEFFUNC(put,   rnd,xy,8,OP_XY,PACK)
 DEFFUNC(put,no_rnd,xy,8,OP_XY,PACK)
-DEFFUNC(put,   rnd,o,16,OP_C,avg2)
-DEFFUNC(put,   rnd,x,16,OP_X,avg2)
-DEFFUNC(put,no_rnd,x,16,OP_X,avg2)
-DEFFUNC(put,   rnd,y,16,OP_Y,avg2)
-DEFFUNC(put,no_rnd,y,16,OP_Y,avg2)
+DEFFUNC(put,   rnd,o,16,OP_C,avg32)
+DEFFUNC(put,   rnd,x,16,OP_X,avg32)
+DEFFUNC(put,no_rnd,x,16,OP_X,avg32)
+DEFFUNC(put,   rnd,y,16,OP_Y,avg32)
+DEFFUNC(put,no_rnd,y,16,OP_Y,avg32)
 DEFFUNC(put,   rnd,xy,16,OP_XY,PACK)
 DEFFUNC(put,no_rnd,xy,16,OP_XY,PACK)
 
 #undef OP
 #define OP avg
 
-DEFFUNC(avg,   rnd,o,8,OP_C,avg2)
-DEFFUNC(avg,   rnd,x,8,OP_X,avg2)
-DEFFUNC(avg,no_rnd,x,8,OP_X,avg2)
-DEFFUNC(avg,   rnd,y,8,OP_Y,avg2)
-DEFFUNC(avg,no_rnd,y,8,OP_Y,avg2)
+DEFFUNC(avg,   rnd,o,8,OP_C,avg32)
+DEFFUNC(avg,   rnd,x,8,OP_X,avg32)
+DEFFUNC(avg,no_rnd,x,8,OP_X,avg32)
+DEFFUNC(avg,   rnd,y,8,OP_Y,avg32)
+DEFFUNC(avg,no_rnd,y,8,OP_Y,avg32)
 DEFFUNC(avg,   rnd,xy,8,OP_XY,PACK)
 DEFFUNC(avg,no_rnd,xy,8,OP_XY,PACK)
-DEFFUNC(avg,   rnd,o,16,OP_C,avg2)
-DEFFUNC(avg,   rnd,x,16,OP_X,avg2)
-DEFFUNC(avg,no_rnd,x,16,OP_X,avg2)
-DEFFUNC(avg,   rnd,y,16,OP_Y,avg2)
-DEFFUNC(avg,no_rnd,y,16,OP_Y,avg2)
+DEFFUNC(avg,   rnd,o,16,OP_C,avg32)
+DEFFUNC(avg,   rnd,x,16,OP_X,avg32)
+DEFFUNC(avg,no_rnd,x,16,OP_X,avg32)
+DEFFUNC(avg,   rnd,y,16,OP_Y,avg32)
+DEFFUNC(avg,no_rnd,y,16,OP_Y,avg32)
 DEFFUNC(avg,   rnd,xy,16,OP_XY,PACK)
 DEFFUNC(avg,no_rnd,xy,16,OP_XY,PACK)
 
diff -urN ffmpeg_org/libavcodec/sh4/dsputil_sh4.c ffmpeg_dgs/libavcodec/sh4/dsputil_sh4.c
--- ffmpeg_org/libavcodec/sh4/dsputil_sh4.c	2008-09-29 20:40:31.000000000 +0900
+++ ffmpeg_dgs/libavcodec/sh4/dsputil_sh4.c	2008-09-29 20:41:41.000000000 +0900
@@ -26,8 +26,8 @@
 static void memzero_align8(void *dst,size_t size)
 {
 #if defined(__SH4__) || defined(__SH4_SINGLE__) || defined(__SH4_SINGLE_ONLY__)
-        (char*)dst+=size;
-        size/=8*4;
+        dst = (char*)dst + size;
+	size/=8*4;
         asm(
 #if defined(__SH4__)
         " fschg\n"  //single float mode
diff -urN ffmpeg_org/libavcodec/sh4/idct_sh4.c ffmpeg_dgs/libavcodec/sh4/idct_sh4.c
--- ffmpeg_org/libavcodec/sh4/idct_sh4.c	2008-09-29 20:40:31.000000000 +0900
+++ ffmpeg_dgs/libavcodec/sh4/idct_sh4.c	2008-09-29 20:41:41.000000000 +0900
@@ -126,7 +126,7 @@
 /* this code work worse on gcc cvs. 3.2.3 work fine */
 
 
-#if 1
+#if 0
 //optimized
 
 void idct_sh4(DCTELEM *block)