changeset 874:8cc0d241da37 libavcodec

* compilation fix (ARM users please check)
author kabi
date Tue, 19 Nov 2002 07:33:36 +0000
parents 47f44f256a3c
children 2c350f59233a
files armv4l/dsputil_arm.c armv4l/mpegvideo_arm.c mpegvideo.c mpegvideo.h
diffstat 4 files changed, 13 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/armv4l/dsputil_arm.c	Mon Nov 18 10:39:22 2002 +0000
+++ b/armv4l/dsputil_arm.c	Tue Nov 19 07:33:36 2002 +0000
@@ -21,7 +21,7 @@
 
 extern void j_rev_dct_ARM(DCTELEM *data);
 
-void dsputil_init_armv4l(void)
+void dsputil_init_armv4l(DSPContext* c, unsigned mask)
 {
 //  ff_idct = j_rev_dct_ARM;
 }
--- a/armv4l/mpegvideo_arm.c	Mon Nov 18 10:39:22 2002 +0000
+++ b/armv4l/mpegvideo_arm.c	Tue Nov 19 07:33:36 2002 +0000
@@ -22,18 +22,21 @@
 #include "../avcodec.h"
 
 extern void j_rev_dct_ARM(DCTELEM *data);
+/* XXX: local hack */
+static void (*ff_put_pixels_clamped)(const DCTELEM *block, UINT8 *pixels, int line_size);
+static void (*ff_add_pixels_clamped)(const DCTELEM *block, UINT8 *pixels, int line_size);
 
 /* XXX: those functions should be suppressed ASAP when all IDCTs are
    converted */
 static void arm_idct_put(UINT8 *dest, int line_size, DCTELEM *block)
 {
     j_rev_dct_ARM (block);
-    put_pixels_clamped(block, dest, line_size);
+    ff_put_pixels_clamped(block, dest, line_size);
 }
 static void arm_idct_add(UINT8 *dest, int line_size, DCTELEM *block)
 {
     j_rev_dct_ARM (block);
-    add_pixels_clamped(block, dest, line_size);
+    ff_add_pixels_clamped(block, dest, line_size);
 }
 
 void MPV_common_init_armv4l(MpegEncContext *s)
@@ -41,6 +44,9 @@
     int i;
     const int idct_algo= s->avctx->idct_algo;
 
+    ff_put_pixels_clamped = s->avctx->dsp.put_pixels_clamped;
+    ff_add_pixels_clamped = s->avctx->dsp.put_pixels_clamped;
+
     if(idct_algo==FF_IDCT_AUTO || idct_algo==FF_IDCT_ARM){
         s->idct_put= arm_idct_put;
         s->idct_add= arm_idct_add;
--- a/mpegvideo.c	Mon Nov 18 10:39:22 2002 +0000
+++ b/mpegvideo.c	Tue Nov 19 07:33:36 2002 +0000
@@ -228,7 +228,7 @@
     MPV_common_init_mmi(s);
 #endif
 #ifdef ARCH_ARMV4L
-    MPV_common_init_armv4l();
+    MPV_common_init_armv4l(s);
 #endif
 #ifdef ARCH_POWERPC
     MPV_common_init_ppc(s);
--- a/mpegvideo.h	Mon Nov 18 10:39:22 2002 +0000
+++ b/mpegvideo.h	Tue Nov 19 07:33:36 2002 +0000
@@ -551,6 +551,9 @@
 #ifdef HAVE_MMI
 void MPV_common_init_mmi(MpegEncContext *s);
 #endif
+#ifdef ARCH_ARMV4L
+    MPV_common_init_armv4l(MpegEncContext *s);
+#endif
 #ifdef ARCH_POWERPC
 void MPV_common_init_ppc(MpegEncContext *s);
 #endif