comparison armv4l/mpegvideo_arm.c @ 874:8cc0d241da37 libavcodec

* compilation fix (ARM users please check)

873:47f44f256a3c

#include "../dsputil.h"
#include "../mpegvideo.h"
#include "../avcodec.h"

extern void j_rev_dct_ARM(DCTELEM *data);

/* 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);
}
static void arm_idct_add(UINT8 *dest, int line_size, DCTELEM *block)
{
    j_rev_dct_ARM (block);
    add_pixels_clamped(block, dest, line_size);
}

void MPV_common_init_armv4l(MpegEncContext *s)
{
    int i;
    const int idct_algo= s->avctx->idct_algo;

    if(idct_algo==FF_IDCT_AUTO || idct_algo==FF_IDCT_ARM){
        s->idct_put= arm_idct_put;
        s->idct_add= arm_idct_add;
        s->idct_permutation_type= FF_NO_IDCT_PERM;
    }

874:8cc0d241da37

#include "../dsputil.h"
#include "../mpegvideo.h"
#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);
    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);
    ff_add_pixels_clamped(block, dest, line_size);
}

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;
        s->idct_permutation_type= FF_NO_IDCT_PERM;
    }