diff options
| author | Zdenek Kabelac <kabi@informatics.muni.cz> | 2002-11-19 07:33:36 +0000 |
|---|---|---|
| committer | Zdenek Kabelac <kabi@informatics.muni.cz> | 2002-11-19 07:33:36 +0000 |
| commit | 83f238cbf0c038245d2b2dffa5beb0916e7c36d2 (patch) | |
| tree | 5d79f749d3a742cd135906639ac7f0bc451504bd /libavcodec | |
| parent | 231dd3f32747bc9f3a53490d37d6c0fb41104422 (diff) | |
* compilation fix (ARM users please check)
Originally committed as revision 1225 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/armv4l/dsputil_arm.c | 2 | ||||
| -rw-r--r-- | libavcodec/armv4l/mpegvideo_arm.c | 10 | ||||
| -rw-r--r-- | libavcodec/mpegvideo.c | 2 | ||||
| -rw-r--r-- | libavcodec/mpegvideo.h | 3 |
4 files changed, 13 insertions, 4 deletions
diff --git a/libavcodec/armv4l/dsputil_arm.c b/libavcodec/armv4l/dsputil_arm.c index 66358b38d3..e459b33915 100644 --- a/libavcodec/armv4l/dsputil_arm.c +++ b/libavcodec/armv4l/dsputil_arm.c @@ -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; } diff --git a/libavcodec/armv4l/mpegvideo_arm.c b/libavcodec/armv4l/mpegvideo_arm.c index afb7a41c9d..a3fa8b726c 100644 --- a/libavcodec/armv4l/mpegvideo_arm.c +++ b/libavcodec/armv4l/mpegvideo_arm.c @@ -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 @@ void MPV_common_init_armv4l(MpegEncContext *s) 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; diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index f1a94ccbee..9f53c7fd3b 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -228,7 +228,7 @@ int DCT_common_init(MpegEncContext *s) 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); diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h index 9b344ee7ac..9053314881 100644 --- a/libavcodec/mpegvideo.h +++ b/libavcodec/mpegvideo.h @@ -551,6 +551,9 @@ void MPV_common_init_mlib(MpegEncContext *s); #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 |