Revision e3905ce0 libavcodec/ppc/h264_altivec.c

View differences:

libavcodec/ppc/h264_altivec.c
196 196
    const vec_s16_t vD = vec_splat((vec_s16_t)vABCD, 7);
197 197
    LOAD_ZERO;
198 198
    const vec_s16_t v28ss = vec_sub(vec_sl(vec_splat_s16(1),vec_splat_u16(5)),vec_splat_s16(4));
199
    const vec_u16_t v6us = vec_splat_u16(6);
199
    const vec_u16_t v6us  = vec_splat_u16(6);
200 200
    register int loadSecond     = (((unsigned long)src) % 16) <= 7 ? 0 : 1;
201 201
    register int reallyBadAlign = (((unsigned long)src) % 16) == 15 ? 1 : 0;
202 202

  
......
392 392
#define avg_pixels16_l2_altivec(d,s1,s2,ds,s1s,h) avg_pixels16_l2(d,s1,s2,ds,s1s,16,h)
393 393
 */
394 394

  
395
  H264_MC(put_, 16, altivec)
396
  H264_MC(avg_, 16, altivec)
395
H264_MC(put_, 16, altivec)
396
H264_MC(avg_, 16, altivec)
397 397

  
398 398

  
399 399
/****************************************************************************
......
685 685
    r15 = vec_mergel(r3, r7);   /*3,7,11,15 set 1*/                        \
686 686
                                                                           \
687 687
    /*Third merge*/                                                        \
688
    r0 = vec_mergeh(r8, r12);   /*0,2,4,6,8,10,12,14 set 0*/               \
689
    r1 = vec_mergel(r8, r12);   /*0,2,4,6,8,10,12,14 set 1*/               \
690
    r2 = vec_mergeh(r9, r13);   /*0,2,4,6,8,10,12,14 set 2*/               \
688
    r0 = vec_mergeh(r8,  r12);  /*0,2,4,6,8,10,12,14 set 0*/               \
689
    r1 = vec_mergel(r8,  r12);  /*0,2,4,6,8,10,12,14 set 1*/               \
690
    r2 = vec_mergeh(r9,  r13);  /*0,2,4,6,8,10,12,14 set 2*/               \
691 691
    r4 = vec_mergeh(r10, r14);  /*1,3,5,7,9,11,13,15 set 0*/               \
692 692
    r5 = vec_mergel(r10, r14);  /*1,3,5,7,9,11,13,15 set 1*/               \
693 693
    r6 = vec_mergeh(r11, r15);  /*1,3,5,7,9,11,13,15 set 2*/               \

Also available in: Unified diff