Revision a0403006 libavcodec/armv4l/dsputil_arm.c

View differences:

libavcodec/armv4l/dsputil_arm.c
27 27
extern void j_rev_dct_ARM(DCTELEM *data);
28 28
extern void simple_idct_ARM(DCTELEM *data);
29 29

  
30
extern void simple_idct_armv5te(DCTELEM *data);
31
extern void simple_idct_put_armv5te(uint8_t *dest, int line_size,
32
                                    DCTELEM *data);
33
extern void simple_idct_add_armv5te(uint8_t *dest, int line_size,
34
                                    DCTELEM *data);
35

  
30 36
/* XXX: local hack */
31 37
static void (*ff_put_pixels_clamped)(const DCTELEM *block, uint8_t *pixels, int line_size);
32 38
static void (*ff_add_pixels_clamped)(const DCTELEM *block, uint8_t *pixels, int line_size);
......
196 202
    ff_add_pixels_clamped = c->add_pixels_clamped;
197 203

  
198 204
    if(idct_algo == FF_IDCT_AUTO){
199
#ifdef HAVE_IPP
205
#if defined(HAVE_IPP)
200 206
        idct_algo = FF_IDCT_IPP;
207
#elif defined(HAVE_ARMV5TE)
208
        idct_algo = FF_IDCT_SIMPLEARMV5TE;
201 209
#else
202 210
        idct_algo = FF_IDCT_ARM;
203 211
#endif
......
213 221
        c->idct_add= simple_idct_ARM_add;
214 222
        c->idct    = simple_idct_ARM;
215 223
        c->idct_permutation_type= FF_NO_IDCT_PERM;
224
#ifdef HAVE_ARMV5TE
225
    } else if (idct_algo==FF_IDCT_SIMPLEARMV5TE){
226
        c->idct_put= simple_idct_put_armv5te;
227
        c->idct_add= simple_idct_add_armv5te;
228
        c->idct    = simple_idct_armv5te;
229
        c->idct_permutation_type = FF_NO_IDCT_PERM;
230
#endif
216 231
#ifdef HAVE_IPP
217 232
    } else if (idct_algo==FF_IDCT_IPP){
218 233
        c->idct_put= simple_idct_ipp_put;

Also available in: Unified diff